Added in Boom.wrap() to controller, reformatted to just use exports.function pattern, added 'Not Implemented'
Merge remote-tracking branch 'upstream/master'
Make Joi be joi (case sensitive on linux)
Merge branch 'master' of github.com:iojohnso/generator-hapijs into iojohnso-master
Merge branch 'iojohnso-master'