Revert "Load .sailsrc and env var config when Sails is loaded progr…

…ammatically"

This reverts commit 13163b0.  This would be a breaking change with possible unintended consequences -- if you want to do this, you can just do `sails.load(require('rc'))`.

lib/app/configuration/load.js

@@ -6,7 +6,6 @@ var _ = require('lodash');
 var async = require('async');
 var CaptainsLog = require('captains-log');
 var path = require('path');
-var rconf = require('./rc');
 
 
 module.exports = function(sails) {
@@ -45,14 +44,10 @@ module.exports = function(sails) {
          */
         mapOverrides: function(cb) {
 
-          // If there's no sails config yet, it means we lifted programmatically,
-          // so we didn't get the `rc` stuff.  Let's load it in now.
-          if (_.isEmpty(sails.config)) {
-            sails.config = rconf || {};
-          }
-
           // Clone the `overrides` that were passed in.
-          var overrides = _.cloneDeep(sails.config);
+          var overrides = _.cloneDeep(sails.config || {});
+
+          // TODO: bring the rconf stuff from bin/sails-lift in here
 
           // Command-line arguments take highest precedence
           // overrides = _.merge(overrides, argv);