lab 4 api
Merge pull request #1809 from aliwatters/master

docs fix typo - registeration -> registration
set X-Content-Type-Options to nosnif for jsonp responses
Update license to add other contributors
fix typo with cabox
Rename org. Closes #1820
Update README.md
Added JOI validation to manifest.
Enable cache generateTimeout. Closes #1826
Merge branch 'master' of github.com:hapijs/hapi
Merge branch 'master' of github.com:hapijs/hapi into lab4
Fix fraction in setTimeout. Closes #1827
Closes #1802
Merge pull request #1810 from patrickkettner/add-nosniff

set X-Content-Type-Options to nosnif for jsonp responses
qs 1.0
Merge branch 'master' of github.com:hapijs/hapi
Merge pull request #1818 from lloydbenson/master

fix typo cabox to catbox
Merge pull request #1822 from arb/validate-manifest

Added joi validation to manifest.
Replace mime. Closes #1832
Merge branch 'master' of github.com:hapijs/hapi