Always install git/vim.
Rename packages to extra_packages.