changes to get the vagrant env working again

These are mostly changes to the provision.sh script, and minor changes needed for the provisioner too, but that should have no impact at all on anything outside of the Vagrantfile/provision.sh pair.