tweaks to vimrc, and updated submodules