Load environment-specific configuration folders
Merge branch 'master' of github.com:balderdashy/sails
Merge branch 'master' of github.com:balderdashy/sails