Various fixes for the new Vagrant.

Make sure to `bundle install` and that `which vagrant` returns
/usr/bin/vagrant