diff --git a/.eslintrc b/.eslintrc.json
similarity index 97%
rename from .eslintrc
rename to .eslintrc.json
index 2672cce..b7940fe 100644
--- a/.eslintrc
+++ b/.eslintrc.json
@@ -22,7 +22,6 @@
         "no-else-return": 1,
         "no-empty": 2,
         "no-empty-character-class": 2,
-        "no-empty-label": 1,
         "no-eq-null": 0,
         "no-eval": 2,
         "no-ex-assign": 2,
@@ -133,7 +132,8 @@
         "indent": [1, 2, {"SwitchCase": 1}],
         "init-declarations": 0,
         "key-spacing": [1, { "beforeColon": false, "afterColon": true }],
-        "lines-around-comment": 0,
+        "keyword-spacing": 1,
+	"lines-around-comment": 0,
         "max-depth": [1, 4],
         "max-len": [1, 160, 2],
         "max-nested-callbacks": [1, 2],
@@ -161,12 +161,10 @@
         "semi": [1, "always"],
         "semi-spacing": [1, {"before": false, "after": true}],
         "sort-vars": 0,
-        "space-after-keywords": [1, "always"],
         "space-before-blocks": [1, "always"],
         "space-before-function-paren": [1, "never"],
         "space-in-parens": [1, "never"],
         "space-infix-ops": 1,
-        "space-return-throw-case": 1,
         "space-unary-ops": [1, { "words": true, "nonwords": false }],
         "spaced-comment": 0,
         "strict": [2, "global"],
@@ -179,6 +177,7 @@
         "yoda": [0, "never"]
     },
     "env": {
-        "node": true
+        "node": true,
+	"es6": true
     }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 47020cb..27f1244 100644
--- a/package.json
+++ b/package.json
@@ -52,9 +52,9 @@
   "devDependencies": {
     "buffer-equal": "1.0.0",
     "connect": "^3.4.0",
-    "eslint": "^1.0.0",
+    "eslint": "^2.1.0",
     "istanbul": "^0.4.1",
-    "phantomjs": "^2.1.3",
+    "phantomjs-prebuilt": "^2.1.3",
     "serve-static": "^1.10.0",
     "tap-dot": "^1.0.0",
     "tape": "^4.0.2"
diff --git a/test/run-compare.js b/test/run-compare.js
index fe4ef23..2c98a06 100644
--- a/test/run-compare.js
+++ b/test/run-compare.js
@@ -2,7 +2,7 @@ require("./http-server");
 
 var path = require('path');
 var childProcess = require('child_process');
-var phantomjs = require('phantomjs');
+var phantomjs = require('phantomjs-prebuilt');
 var binPath = phantomjs.path;
 
 var childArgs = [
@@ -21,4 +21,4 @@ try {
   });
 } catch (e) {
   console.log("Error starting phantomjs");
-}
\ No newline at end of file
+}