Merged in lodash from karbassi

diff --cc client/assets/dev/build.js
Simple merge

diff --cc client/assets/dev/index.html.tmpl
Simple merge

diff --cc package.json
index 20480d6ad7ae4e2f4cc3cf636e1f333ca683e83e,e34d54d7804e051bc4af08c82924dfeddb3370fd..431e742c9dd74df20810e59cc74529d549c8cb01
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -8,8 -8,7 +8,8 @@@
      "node-static": "0.5.9",\r
      "uglify-js": "1.2.3",\r
      "socket.io": "0.8.7",\r
-     "underscore": "1.3.3",\r
-     "daemonize2": "0.4.0-rc.5",\r
-     "range_check": "0.0.1"\r
++    "range_check": "0.0.1",\r
+     "lodash": "0.9.1",\r
+     "daemonize2": "0.4.0-rc.5"\r
    }\r
  }\r

diff --cc server/client.js
Simple merge

diff --cc server/irc/commands.js
Simple merge

diff --cc server/kiwi.js
Simple merge

diff --cc server/weblistener.js
index 08536fc7f8a671b316ce4922a798f0b39b13f3ae,f14f2651be16c41f0b2a45161539828a23afb4ce..3ab24370abd52d5318a0927ad4cfca5b38bfa550
--- 1/server/weblistener.js
--- 2/server/weblistener.js
+++ b/server/weblistener.js
@@@ -6,11 -6,10 +6,11 @@@ var ws          = require('socket.io')
      fs          = require('fs'),
      dns         = require('dns'),
      url         = require('url'),
-     _           = require('underscore'),
+     _           = require('lodash'),
      Client      = require('./client.js').Client,
      HttpHandler = require('./httphandler.js').HttpHandler,
 -    rehash      = require('./rehash.js');
 +    rehash      = require('./rehash.js'),
 +    range_check = require('range_check');