vim: some cleanup and new bundles