Vagrant provisioning

Changes to handle proper provisioning in vagrant.