diff --git a/.eslintrc b/.eslintrc
index 9f56994..adc1f4b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,6 +11,7 @@
 		"block-scoped-var": [0],
 		"brace-style": [2, "1tbs", { "allowSingleLine": true }],
 		"camelcase": [2],
+		"comma-dangle": [2, "never"],
 		"comma-spacing": [2],
 		"comma-style": [2, "last"],
 		"complexity": [0, 11],
@@ -40,7 +41,6 @@
 		"no-bitwise": [0],
 		"no-caller": [2],
 		"no-catch-shadow": [2],
-		"no-comma-dangle": [2],
 		"no-cond-assign": [2],
 		"no-console": [2],
 		"no-constant-condition": [2],
@@ -48,6 +48,7 @@
 		"no-debugger": [2],
 		"no-delete-var": [2],
 		"no-div-regex": [0],
+		"no-dupe-args": [2],
 		"no-dupe-keys": [2],
 		"no-else-return": [0],
 		"no-empty": [2],
@@ -80,7 +81,7 @@
 		"no-mixed-spaces-and-tabs": [2, false],
 		"no-multi-spaces": [2],
 		"no-multi-str": [2],
-		"no-multiple-empty-lines": [0, {"max": 2}],
+		"no-multiple-empty-lines": [2, {"max": 1}],
 		"no-native-reassign": [2],
 		"no-negated-in-lhs": [2],
 		"no-nested-ternary": [0],
@@ -112,6 +113,7 @@
 		"no-sparse-arrays": [2],
 		"no-sync": [0],
 		"no-ternary": [0],
+		"no-throw-literal": [2],
 		"no-trailing-spaces": [2],
 		"no-undef": [2],
 		"no-undef-init": [2],
@@ -131,8 +133,10 @@
 		"quote-props": [0],
 		"radix": [0],
 		"semi": [2],
+		"semi-spacing": [2, { "before": false, "after": true }],
 		"sort-vars": [0],
-		"space-after-keywords": [2, "always", { "checkFunctionKeyword": true }],
+		"space-after-keywords": [2, "always"],
+		"space-before-function-parentheses": [2, { "anonymous": "always", "named": "never" }],
 		"space-before-blocks": [0, "always"],
 		"space-in-brackets": [0, "never", {
 			"singleValue": true,
@@ -145,7 +149,6 @@
 		"space-in-parens": [2, "never"],
 		"space-infix-ops": [2],
 		"space-return-throw-case": [2],
-		"space-after-function-name": [2, "never"],
 		"space-unary-ops": [2, { "words": true, "nonwords": false }],
 		"spaced-line-comment": [0, "always"],
 		"strict": [0],
diff --git a/package.json b/package.json
index 32c20e7..ef4d857 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,11 @@
 		"tape": "^3.5.0",
 		"covert": "^1.0.1",
 		"jscs": "^1.11.3",
-		"editorconfig-tools": "^0.0.1",
+		"editorconfig-tools": "^0.1.1",
 		"nsp": "^1.0.0",
-		"eslint": "^0.14.1",
-		"semver": "^4.2.2"
+		"eslint": "^0.16.1",
+		"semver": "^4.3.1",
+		"replace": "^0.3.0"
 	},
 	"testling": {
 		"files": "test.js",