Hapi 6 update
Hapi 6 update
Resolve conflicts
Merge pull request #26 from jaw187/master

Hapi 6 update