Merged changes in Vagrantfile