Submodule cleanup + updated vimrc