Merge branch 'master' into hapi-upgrade
feat(hapi): upgrade hapi to version 6
Merge pull request #308 from hoodiehq/hapi-upgrade

Hapi upgrade