config/local.js settings should take precedence over all other config files.
Don't allow env/* config files to set the environment
Merge branch 'master' of github.com:balderdashy/sails