Merge pull request #87 from hapijs/cleanup

Cleaned up tests.
Add catbox-s3 adapter
Merge pull request #88 from fhemberger/patch-1

Add catbox-s3 adapter
Fixed typo