Update to Vagrantfile
Merge from pull