Numerous changes in Vagrantfile