diff --git a/.editorconfig b/.editorconfig
index ff999c4d4..619c178d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,3 @@ trim_trailing_whitespace = false
 [{.travis.yml,npm-shrinkwrap.json,package.json}]
 indent_style = space
 indent_size = 2
-[Makefile]
-indent_style = tab
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..121531af8
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b9afabe93..000000000
--- a/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-lint:
-	@./node_modules/.bin/eslint .
-.PHONY: lint
diff --git a/package.json b/package.json
index 2a40bf058..a179d93e4 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "main": "app.js",
   "license": "MIT",
   "scripts": {
-    "test": "make lint",
+    "test": "npm run-script lint",
+    "lint": "eslint .",
     "dev": "webpack --config webpack.config.js --progress --colors --watch",
     "build": "webpack --config webpack.production.js --progress --colors",
     "postinstall": "bin/heroku",