Vagrant box moved to Vagrant Cloud
Merge branch 'vagrant'
Updated licence