Fixed provisioning doing a ton of extra work each vagrant up
Fixed merg conflict.