Adjust vagrant provision scripts so they can be run repeatedly.

@jrichter let me know what you think.

This works on my local box -- would be interested to know if you can run it on yours too.