rewind vagrantfile to upstream/master