Merge mocha updates from project template

In the previous merge, the replacement of mocha-ur2ue with
--unhandled-rejections=strict was not merged correctly.  Finish merge.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>

Author: kevinoid

package.json

@@ -43,13 +43,14 @@
     "lint-js": "eslint --report-unused-disable-directives . && echo ESLint passed.",
     "postpublish": "git -C doc push && git push --follow-tags origin master gh-pages && echo Remember to update GitHub Releases from CHANGELOG.md",
     "postversion": "rimraf doc && git clone -b gh-pages -l -q . doc && npm run doc && git -C doc add . && git -C doc commit -n -m \"Docs for v$npm_package_version\"",
-    "preversion": "npm run test-cov && nyc check-coverage --statements 95 && depcheck --ignore-dirs doc --ignores mocha-ur2ue && david && node ./bin/git-branch-is.js master && hub-ci-status -vv --wait",
+    "preversion": "npm run test-cov && nyc check-coverage --statements 95 && depcheck --ignore-dirs doc && david && node ./bin/git-branch-is.js master && hub-ci-status -vv --wait",
     "test": "npm run lint && npm run test-unit",
     "test-cov": "npm run lint && npm run test-unit-cov",
     "pretest-unit": "node test-bin/set-up-test-repos.js",
-    "test-unit": "mocha --parallel --require mocha-ur2ue --require ./test-lib/root-hooks.js --recursive test",
+    "test-unit": "node --throw-deprecation --unhandled-rejections=strict node_modules/mocha/bin/mocha --parallel --require ./test-lib/root-hooks.js --recursive test",
     "posttest-unit": "rimraf test-repos",
-    "test-unit-cov": "nyc npm run test-unit",
+    "//": "Note: nyc incompatible with --parallel.  See https://github.com/istanbuljs/nyc/issues/1328 and https://github.com/mochajs/mocha/issues/4372",
+    "test-unit-cov": "nyc --reporter=lcov --reporter=text node --throw-deprecation --unhandled-rejections=strict node_modules/mocha/bin/mocha --require ./test-lib/root-hooks.js --recursive test",
     "upload-cov": "codecov < ./coverage/lcov.info && coveralls < ./coverage/lcov.info",
     "version": "npm run changelog && echo && echo === Please edit CHANGELOG.md as desired, then exit === && echo && $npm_config_shell && git commit -m \"Update CHANGELOG.md for $npm_package_version\" CHANGELOG.md",
     "version-deps": "npm install conventional-changelog-cli david depcheck git-branch-is hub-ci-status"