Merge branch 'master' into use-talk-linting-preset

Conflicts:
	package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,
@@ -103,6 +103,7 @@
     "fs-extra": "^4.0.1",
     "gql-merge": "^0.0.4",
     "graphql": "^0.9.1",
+    "graphql-anywhere": "^3.1.0",
     "graphql-docs": "^0.2.0",
     "graphql-errors": "^2.1.0",
     "graphql-redis-subscriptions": "^1.3.0",
@@ -144,7 +145,6 @@
     "passport-local": "^1.0.0",
     "pluralize": "^7.0.0",
     "postcss-loader": "^1.3.3",
-    "postcss-modules": "^0.5.2",
     "postcss-smart-import": "^0.5.1",
     "precss": "^1.4.0",
     "prop-types": "^15.5.10",
@@ -180,7 +180,6 @@
     "url-search-params": "^0.9.0",
     "uuid": "^3.1.0",
     "webpack": "^2.3.1",
-    "webpack-sources": "^1.0.1",
     "yaml-loader": "^0.4.0",
     "yamljs": "^0.2.10"
   },
@@ -197,8 +196,7 @@
     "nodemon": "^1.11.0",
     "pre-git": "^3.15.3",
     "sinon": "^3.2.1",
-    "sinon-chai": "^2.13.0",
-    "supertest": "^2.0.1"
+    "sinon-chai": "^2.13.0"
   },
   "engines": {
     "node": "^8"