Initial Hapi 6 update

Initial update for #38