diff --git a/app.js b/app.js
index e61d1d1..02e2036 100644
--- a/app.js
+++ b/app.js
@@ -2,28 +2,17 @@
  * Module dependencies.
  */
 
-var express   = require('express')
-  , http      = require('http')
-  , path      = require('path')
-  , partials  = require('express-partials')
-  , config    = require('./config')
-  , app       = express();
-
-/**
- * Source: http://stackoverflow.com/a/7965071
- */
-function mergeRecursive(obj1, obj2) {
-    for (var p in obj2) {
-        if (obj2.hasOwnProperty(p)) {
-            obj1[p] = (typeof obj2[p] === 'object') ? mergeRecursive(obj1[p], obj2[p]) : obj2[p];
-        }
-    }
-    return obj1;
-}
+var express    = require('express')
+  , http       = require('http')
+  , path       = require('path')
+  , partials   = require('express-partials')
+  , underscore = require('underscore')
+  , config     = require('./config')
+  , app        = express();
 
 // set config by environment
 if (process.env.ENVIRONMENT!='default') {
-    app.config = mergeRecursive(config.default, config[process.env.ENVIRONMENT]);
+    app.config = underscore.extend(config.default, config[process.env.ENVIRONMENT]);
 } else {
     app.config = config.default;
 }
diff --git a/package.json b/package.json
index 1afde7b..2dd735b 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,8 @@
     "socket.io": "0.x.x",
     "named-argv": "0.x.x",
     "jsdom": "0.x.x",
-    "ejs": "0.x.x"
+    "ejs": "0.x.x",
+    "url": "0.x.x",
+    "underscore": "1.x.x"
   }
 }
diff --git a/routes/index.js b/routes/index.js
index 8209f98..e14fb5a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -13,7 +13,7 @@ module.exports = function(app) {
 }
 
 function getHomePage(req, res) {
-	var port = res.app.settings.config.port;
+	var port = res.app.settings.config.server.port;
 
 	res.render('index', {
 		port: port