Big changes to Vim bundles, re-organized them