Merge branch 'master' of github.com:prawnsalad/KiwiIRC

Conflicts:
	package.json

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

diff --cc package.json
index ab4dde30a5ca9852ca336d62da24b22631b4de66,d9831670cd0f2feb28fcd4806bdbd60310b1ccbd..35b177b0da6d06472a94c0af198634af13a10f2e
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -7,8 -7,8 +7,9 @@@
    "dependencies": {\r
      "node-static": "0.5.9",\r
      "uglify-js": "1.2.3",\r
--    "socket.io": "0.8.7",\r
-     "underscore": "1.3.3"\r
++    "socket.io": "0.8.7",
+     "underscore": "1.3.3",\r
+     "daemonize2": "0.4.0-rc.5"\r
 -  }\r
 +  },\r
-   "private": true\r
++  "private": true
  }\r