VM is provisioned twice on first boot

[bfirsh]

In my attempt to make automatic upgrading work, vagrant up is run, then vagrant provision is run. It shouldn't do both of these on first boot, but we also need to make sure that the machine is reliably provisioned in case of failure.