make the two vagrant box templates more consistent

This makes it easier to see the differences which really matter.
Merge pull request #400 from aspiers/vagrant-templates

make the two vagrant box templates more consistent