diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000..552fce7fbf
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,5 @@
+node_modules/*
+bower_components/*
+test/*
+src/**/demo/*
+src/**/experimental/*
diff --git a/.eslintrc b/.eslintrc
index d959af7b16..873b5c969e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,9 @@
 {
   "extends": "eslint:recommended",
+  "rules": {
+    "no-cond-assign": [2, "except-parens"],
+    "no-console": 0
+  },
   "env": {
     "browser": true
   },
diff --git a/gulpfile.js b/gulpfile.js
index c9165940c2..b3e0227942 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -126,8 +126,9 @@ gulp.task('release', function(cb) {
   runseq('default', ['copy-bower-json', 'audit'], cb);
 });
 
-gulp.task('eslint', function() {
+gulp.task('lint', function() {
   return gulp.src('src/**/*.html')
     .pipe(eslint())
-    .pipe(eslint.format());
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
 });