Fix and clean up Vagrantfile

See https://github.com/mitchellh/vagrant/issues/4363