Switch to vagrant package (from vagrant-base)
Merge branch 'master' into pat