Feature vagrantise

This is now in the hands of Vagrant