removed  dupe test, updated hapi dev-dep
Merge remote-tracking branch 'origin/master'