Error/log cleanup.
Closes https://github.com/balderdashy/sails/issues/1449
Merge branch 'master' of github.com:balderdashy/sails