Fix catbox and async deps. Closes #1801
Merge branch 'master' of github.com:spumko/hapi