Merge branch 'master' into greenkeeper/eslint-6.2.0

Author: jamescodesthings

package-lock.json

@@ -54,7 +54,7 @@
     "@typescript-eslint/parser": "1.13.0",
     "ava": "2.2.0",
     "eslint": "6.2.0",
-    "eslint-config-prettier": "6.0.0",
+    "eslint-config-prettier": "6.1.0",
     "eslint-plugin-ava": "7.1.0",
     "eslint-plugin-prettier": "3.1.0",
     "nodemon": "1.19.1",