fix typo in CONTRIBUTING.md
Fix a duplicate node path require
Expose globals as soon as user config loads.
closes #1672
Merge branch 'master' of https://github.com/balderdashy/sails
Adds res.status() to default response prototype.
Fix error output for sails.request() as it impacts an individual app's unit testing workflow
Cleanup
oops
Revert "oops"

This reverts commit 952c38022b7cf8da2b8935bbf63140f49da85074.
Makes unit tests (errors) pass.
Merge pull request #1685 from netantho/netantho-typo-contributing

fix typo in CONTRIBUTING.md
Merge pull request #1686 from netantho/netantho-duplicate-path-require

Fix a duplicate node path require
Merge remote-tracking branch 'upstream/master'
use my fork of waterline