Add Vagrantfile and README about how to use it
Merge with upstream