Merge branch 'master' into greenkeeper/update-all

Author: iansinnott

.eslintrc

@@ -1,14 +1,3 @@
 {
-  "extends": "airbnb-base",
-  "rules": {
-    "lines-around-directive": [0],
-    "arrow-parens": [0],
-    "no-param-reassign": [0],
-    "max-len": [0],
-    "prefer-arrow-callback": [0],
-    "space-before-function-paren": [0],
-    "func-names": [0],
-    "arrow-body-style": [0],
-    "no-unused-vars": [1, { "vars": "all", "args": "none" }]
-  }
+  "extends": "zen/base"
 }

package.json

@@ -14,7 +14,7 @@
     "node": ">=0.12.0"
   },
   "scripts": {
-    "lint": "eslint --ignore-pattern example .",
+    "lint": "eslint --ignore-pattern example index.js",
     "test": "npm run lint && ava --verbose",
     "bump:patch": "npm version patch -m \"v%s\"",
     "bump:minor": "npm version minor -m \"v%s\"",
@@ -38,8 +38,11 @@
   },
   "devDependencies": {
     "ava": "^0.17.0",
-    "eslint": "^3.7.1",
-    "eslint-config-airbnb-base": "^10.0.1",
-    "eslint-plugin-import": "2.2.0"
+    "babel-eslint": "^7.1.1",
+    "eslint": "^3.10.2",
+    "eslint-config-iansinnott": "^1.0.1",
+    "eslint-config-zen": "^2.0.0",
+    "eslint-plugin-flowtype": "^2.25.0",
+    "eslint-plugin-react": "^6.7.1"
   }
 }