merged master Vagrantfile