Updated http hook defaults so merging in `sails.config.express` works
Merge branch 'master' of github.com:balderdashy/sails