submodule renaming, minor vimrc updates