Oops, missed vagrantfile in the merge