merged Vagrantfile from v1.6.3