Remove bundles, add them as submodules later
Add vim plugins as submodules
Add more plugins