init
Merge branch 'master' of github.com:justinhilles/vagrant