More cleanup, move vim bundles out
Fix vim
More changes