Merge branch 'master' into 7.0

# Conflicts:
#	src/parser/statement.js
#	src/plugins/jsx/index.js

package.json

@@ -5,6 +5,12 @@
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
+  "keywords": [
+    "babel",
+    "javascript",
+    "parser",
+    "babylon"
+  ],
   "repository": "https://github.com/babel/babylon",
   "main": "lib/index.js",
   "files": [
@@ -28,10 +34,9 @@
     "codecov": "^1.0.1",
     "cross-env": "^3.1.4",
     "eslint": "^3.7.1",
-    "eslint-config-babel": "^4.0.1",
-    "eslint-plugin-babel": "^4.0.0",
+    "eslint-config-babel": "^6.0.0",
     "eslint-plugin-flowtype": "^2.20.0",
-    "flow-bin": "^0.37.0",
+    "flow-bin": "^0.38.0",
     "nyc": "^10.0.0",
     "rimraf": "^2.5.4",
     "rollup": "^0.41.0",