Merge pull request #34 from joeybaker/greenkeeper/eslint-4.1.1

Greenkeeper/eslint 4.1.1

Author: joeybaker

.eslintrc.json

@@ -3,29 +3,6 @@
   "plugins": [
     "react"
   ],
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "binaryLiterals": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": true,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "octalLiterals": true,
-    "regexUFlag": true,
-    "regexYFlag": true,
-    "superInFunctions": true,
-    "templateStrings": true,
-    "unicodeCodePointEscapes": true,
-    "globalReturn": true,
-    "jsx": true
-  },
   "env": {
     "browser": true,
     "node": true,

package.json

@@ -69,7 +69,7 @@
     "dmn": "^1.0.5",
     "doctoc": "^1.2.0",
     "enzyme": "^2.8.2",
-    "eslint": "^3.4.0",
+    "eslint": "^4.1.1",
     "eslint-plugin-react": "^7.1.0",
     "faucet": "0.0.1",
     "ghooks": "^1.3.2",