Faster reprovisioning

Various updates so the `vagrant provision` on a running vm doesn't do any unnecessary work.