re-add vim-vagrant and vim-bats