diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 370507ac..69724e9e 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -112,7 +112,13 @@ if [[ -z $NORUBY ]]; then
 fi
 
 if [[ -z $NOVIM ]]; then
-    git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
+    if [[ ! -d ~/.fzf ]]; then
+        git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
+    else
+        cd ~/.fzf
+        git pull
+        git submodule update --init --recursive
+    fi
     ~/.fzf/install --64 --all
     echo "\n" | vim +PluginInstall +qa
     if [[ -z $NOYCM ]]; then
diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system
index ca6afdd9..3052b049 100755
--- a/ubuntu/trusty/configure_fresh_system
+++ b/ubuntu/trusty/configure_fresh_system
@@ -5,7 +5,7 @@ set -v
 
 sudo apt-get update
 sudo apt-get -y upgrade
-install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh"
+install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks whois zsh"
 
 set +e
 for i in `seq 1 3`; do
@@ -15,17 +15,34 @@ done
 set -e
 eval $install_packages
 
-if [[ -z $NO_SYSTEMCTL ]]; then
-	sudo systemctl enable tor
-	sudo systemctl start tor
-fi
-
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
 echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
 sudo apt-get update
 sudo apt-get -y install mono-devel mono-complete 
 
+pushd `pwd`
+
+if [[ -z $NO_COMPILE_VIM ]]; then
+    VIM_BUILD_DIR=/tmp
+    cd "$VIM_BUILD_DIR"
+    git clone https://github.com/vim/vim.git
+    cd vim
+    ./configure --with-features=huge \
+                --enable-multibyte \
+                --enable-rubyinterp \
+                --enable-python3interp=yes \
+                --enable-luainterp \
+                --enable-gui=no \
+                --enable-cscope
+    make -j2
+    sudo make install
+    cd
+    rm -fvr "$VIM_BUILD_DIR/vim"
+fi
+
+popd
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../../"
 export NO_GO=true
diff --git a/ubuntu/trusty/test_insider b/ubuntu/trusty/test_insider
index acfe5d01..d4d50562 100755
--- a/ubuntu/trusty/test_insider
+++ b/ubuntu/trusty/test_insider
@@ -4,7 +4,6 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
-export NO_SYSTEMCTL=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries