More vim maintenance

Fix some Vundle issues
Remove remaining submodules