Update commits from submodules, tweak vimrc