Various fixes to VagrantFile and provision.sh