Merge branch 'master' into csp

package.json

@@ -150,7 +150,7 @@
     "metascraper-title": "^3.9.2",
     "minimist": "^1.2.0",
     "moment": "^2.18.1",
-    "mongoose": "^4.12.3",
+    "mongoose": "^5.1.1",
     "ms": "^2.0.0",
     "murmurhash-js": "^1.0.0",
     "name-all-modules-plugin": "^1.0.1",
@@ -232,7 +232,7 @@
     "husky": "^0.14.3",
     "identity-obj-proxy": "^3.0.0",
     "jest-junit": "^3.6.0",
-    "lint-staged": "^7.0.0",
+    "lint-staged": "^7.1.0",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
     "nightwatch": "^0.9.16",