Rearrange vim.bundles a bit