fixed env config

 
 
 // # settings
 // # settings
 
 
-var _ = require('underscore')
+var mergeDefaults = require('merge-defaults')
 
 
 exports = module.exports = function(config) {
 exports = module.exports = function(config) {
 
 
   var settings = {}
   var settings = {}
 
 
-  _.defaults(settings, config.defaults)
-
   var env = process.env.NODE_ENV || 'development'
   var env = process.env.NODE_ENV || 'development'
 
 
-  _.defaults(settings, config[env])
+  mergeDefaults(settings, config[env], config.defaults)
 
 
   return settings
   return settings
 
 

@@ -33,6 +33,7 @@
     "express-session": "~1.1.0",
     "express-session": "~1.1.0",
     "jade": "~1.1.5",
     "jade": "~1.1.5",
     "less-middleware": "~0.1.15",
     "less-middleware": "~0.1.15",
+    "merge-defaults": "^0.1.0",
     "method-override": "~1.0.1",
     "method-override": "~1.0.1",
     "mongoose": "~3.8.7",
     "mongoose": "~3.8.7",
     "mongoose-json-select": "^0.2.1",
     "mongoose-json-select": "^0.2.1",