Merge pull request #71 from wpreul/master

Upgrading to hapi 5
Updating to work with hapi 6