Merge branch 'master' of git://github.com/walmartlabs/hapi

Merging upstream
Merge branch 'master' of git://github.com/walmartlabs/hapi

Merging upstream
Server.stop now stops gracefully
Fixing failing test
Merge pull request #585 from wpreul/master

Server.stop now stops gracefully