For review: vagrant provisioning update

@Alys: I've made two updates to the provisioning script. Can you see if this solves the issues you've been dealing with in vagrant?