Another round of cleaning vim bundles