From ca55109ea39b1451da2f8e2af564f7a8aec6ed19 Mon Sep 17 00:00:00 2001
From: Simon Boudrias <admin@simonboudrias.com>
Date: Sun, 1 May 2016 16:51:39 -0700
Subject: [PATCH] Bump devDeps and eslint 2.0 settings adjustment

---
 .eslintrc    | 20 ++------------------
 package.json |  4 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 317e39fb..ba8c85cb 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -43,21 +43,6 @@
       2,
       "single"
     ],
-    "space-after-keywords": [
-      2,
-      "always"
-    ],
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never"
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
     "strict": [
       2,
       "global"
@@ -67,6 +52,7 @@
       "all"
     ],
     "eol-last": 2,
+    "keyword-spacing": 2,
     "key-spacing": [
       2,
       {
@@ -89,7 +75,6 @@
     ],
     "no-alert": 2,
     "no-caller": 2,
-    "no-empty-label": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
     "no-implied-eval": 2,
@@ -128,7 +113,6 @@
         "before": false,
         "after": true
       }
-    ],
-    "space-return-throw-case": 2
+    ]
   }
 }
diff --git a/package.json b/package.json
index 13422d51..bbe5187f 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   "devDependencies": {
     "gulp": "^3.6.0",
     "gulp-coveralls": "^0.1.0",
-    "gulp-eslint": "^1.0.0",
+    "gulp-eslint": "^2.0.0",
     "gulp-exclude-gitignore": "^1.0.0",
     "gulp-istanbul": "^0.10.0",
     "gulp-mocha": "^2.0.0",
@@ -83,7 +83,7 @@
     "gulp-plumber": "^1.0.0",
     "jsdoc": "^3.3.0-beta1",
     "mockery": "^1.4.0",
-    "nock": "^3.3.2",
+    "nock": "^8.0.0",
     "pinkie-promise": "^2.0.0",
     "proxyquire": "^1.0.0",
     "sinon": "^1.9.1"