Clean up .gitmodules and alter .vimrc