Merge remote-tracking branch 'template/master'

Signed-off-by: Kevin Locke <[email protected]>

Author: kevinoid

package.json

@@ -25,7 +25,7 @@
     "clean": "rimraf coverage && rimraf doc",
     "doc": "npm run doc-js && npm run doc-spec",
     "doc-js": "rimraf doc/api && jsdoc -c jsdoc.conf.json .",
-    "doc-spec": "rimraf doc/spec && mkdir doc/spec && mocha --reporter doc --recursive test | cat doc-src/spec/header.xhtml - doc-src/spec/footer.xhtml >> doc/spec/index.xhtml",
+    "doc-spec": "rimraf doc/spec && mkdir doc/spec && mocha --reporter doc --recursive test | nodecat doc-src/spec/header.xhtml - doc-src/spec/footer.xhtml > doc/spec/index.xhtml",
     "lint": "npm run lint-js && npm run lint-doc",
     "lint-doc": "jsdoc -c jsdoc-lint.conf.json . && echo JSDoc passed.",
     "lint-js": "eslint . && echo ESLint passed.",
@@ -52,8 +52,9 @@
     "istanbul": "^0.4.1",
     "jsdoc": "^3.4.0",
     "mocha": "^2.3.4",
+    "nodecat": "^0.1.0",
     "pify": "^2.3.0",
-    "rimraf": "^2.5.1"
+    "rimraf": "^2.2.0"
   },
   "engines": {
     "node": ">=0.10",