initial
Merge github.com:sandwitch/vagrant