Merge branch 'master' of https://github.com/yamikuronue/NodeBB into yamikuronue-master

.gitignore

@@ -47,4 +47,7 @@ pidfile
 
 ## Transifex
 tx.exe
-.transifexrc
+.transifexrc
+
+##Coverage output
+coverage

package.json

@@ -11,7 +11,7 @@
   "main": "app.js",
   "scripts": {
     "start": "node loader.js",
-    "test": "mocha ./tests -t 10000"
+    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000"
   },
   "dependencies": {
     "async": "~1.5.0",
@@ -88,9 +88,10 @@
     "xregexp": "~3.1.0"
   },
   "devDependencies": {
-    "mocha": "~1.13.0",
     "grunt": "~0.4.5",
-    "grunt-contrib-watch": "^1.0.0"
+    "grunt-contrib-watch": "^1.0.0",
+    "istanbul": "^0.4.2",
+    "mocha": "~1.13.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"