Some big changes to Vim bundles