Updating vim submodules; small vimrc change