Remove some vim bundles, add others
Remove vimrc cruft from removed plugins
Update submodules