Boom 2.0. Closes #1275
Merge branch 'master' of github.com:spumko/hapi