Removed some submodules, added others, made changes to vimrc to reflect
Submodule update