tom's conf
Merge branch 'master' of github.com:hipponot/vagrant