Updated vim plugins and a few other tweaks