More work on Vagrant.