Improvements to scripts and vagrant provisioning