Merging pull request

Merging pull request
Merge pull request #2 from iojohnso/master

Fixed some bugs, enhanced
Merge pull request #3 from iojohnso/master

Added to Controller... var Boom = require('boom');
Merge remote-tracking branch 'upstream/master'
Make Joi be joi (case sensitive on linux)