Port Vagrant-related work from henrysmith.org for automated development setup
Merge branch 'vagrant'
Heh, can't really claim this any more