eslint fixes

.eslintrc

@@ -28,9 +28,8 @@
         "named": "never"
       }
     ],
-    "space-after-keywords": [
-      2,
-      "always"
+    "keyword-spacing": [
+      2
     ],
     "array-bracket-spacing": [
       2,
@@ -108,13 +107,12 @@
     "eqeqeq": 2,
     "no-alert": 2,
     "no-caller": 2,
-    "no-empty-label": 2,
+    "no-labels": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
     "no-fallthrough": 2,
     "no-implied-eval": 2,
     "no-iterator": 2,
-    "no-labels": 2,
     "no-lone-blocks": 2,
     "no-loop-func": 2,
     "no-multi-spaces": 2,
@@ -158,7 +156,7 @@
     "no-spaced-func": 2,
     "no-trailing-spaces": 2,
     "no-underscore-dangle": 2,
-    "no-wrap-func": 2,
+    "no-extra-parens": 2,
     "semi-spacing": [
       2,
       {
@@ -167,14 +165,13 @@
       }
     ],
     "semi": 2,
-    "space-return-throw-case": 2
   },
   "env": {
     "node": true,
     "mocha": true,
     "es6": true
   },
-  "ecmaFeatures": {
-    "modules": true
+  parserOptions: {
+    sourceType: "module"
   }
 }