Lab 3.0 (really has to stop doing this)
Merge branch 'master' of github.com:spumko/hapi