Vagrant baumanno

A few changes to @baumanno's vagrant pull-request to keep the deployment "the same-ish" for now.