Cleaning up how plugins are handled (not submodules, handled by vundle)