diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000000..4baf9b882b1
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,9 @@
+Apps/HelloWorld.html
+Apps/Sandcastle/ThirdParty/**
+Build/**
+Documentation/**
+Source/Shaders/**
+Source/ThirdParty/**
+Source/Workers/cesiumWorkerBootstrapper.js
+ThirdParty/**
+Tools/**
diff --git a/.gitignore b/.gitignore
index 62da6df65df..3028e8e0b71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /cesium-*.tgz
 .DS_Store
 Thumbs.db
+.eslintcache
 
 /Apps/CesiumViewer/Gallery/gallery-index.js
 
diff --git a/.travis.yml b/.travis.yml
index 4ff7b4d829b..84f1c5d5742 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ script:
   - echo -en 'travis_fold:end:script.deployPending\\r'
 
   - echo 'eslint' && echo -en 'travis_fold:start:script.eslint\\r'
-  - npm run eslint -- --failTaskOnError
+  - npm run eslint
   - echo -en 'travis_fold:end:script.eslint\\r'
 
   - echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
diff --git a/gulpfile.js b/gulpfile.js
index 8bc4eb7ec65..b7b94fb6286 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -12,7 +12,6 @@ var readline = require('readline');
 var request = require('request');
 
 var globby = require('globby');
-var eslint = require('gulp-eslint');
 var gulpTap = require('gulp-tap');
 var rimraf = require('rimraf');
 var glslStripComments = require('glsl-strip-comments');
@@ -66,17 +65,6 @@ var buildFiles = ['Specs/**/*.js',
                   '!Specs/SpecList.js',
                   'Source/Shaders/**/*.glsl'];
 
-var eslintFiles = ['Source/**/*.js',
-                   '!Source/Shaders/**',
-                   '!Source/ThirdParty/**',
-                   '!Source/Workers/cesiumWorkerBootstrapper.js',
-                   'Apps/**/*.js',
-                   'Apps/Sandcastle/gallery/*.html',
-                   '!Apps/Sandcastle/ThirdParty/**',
-                   'Specs/**/*.js',
-                   'Tools/buildTasks/**/*.js',
-                   'gulpfile.js'];
-
 var filesToClean = ['Source/Cesium.js',
                     'Build',
                     'Instrumented',
@@ -233,24 +221,6 @@ gulp.task('instrumentForCoverage', ['build'], function(done) {
     });
 });
 
-gulp.task('eslint', ['build'], function() {
-    var stream = gulp.src(eslintFiles)
-        .pipe(eslint())
-        .pipe(eslint.format());
-    if (yargs.argv.failTaskOnError) {
-        stream = stream.pipe(eslint.failAfterError());
-    }
-    return stream;
-});
-
-gulp.task('eslint-watch', function() {
-    gulp.watch(eslintFiles).on('change', function(event) {
-        gulp.src(event.path)
-            .pipe(eslint())
-            .pipe(eslint.format());
-    });
-});
-
 gulp.task('makeZipFile', ['release'], function() {
     //For now we regenerate the JS glsl to force it to be unminified in the release zip
     //See https://github.com/AnalyticalGraphicsInc/cesium/pull/3106#discussion_r42793558 for discussion.
diff --git a/index.release.html b/index.release.html
index 570b0585f98..4c1f2a88106 100644
--- a/index.release.html
+++ b/index.release.html
@@ -106,7 +106,7 @@
   </div>
   <script type="text/javascript">
       if (window.location.protocol === 'file:') {
-          document.body.innerHTML = ""
+          document.body.innerHTML = "";
           document.write('<p><b>This file must be hosted in a web server.</br>');
           document.write('See our <a href="https://cesiumjs.org/2013/04/12/Cesium-up-and-running/">Getting Started</a> ');
           document.write('tutorial for a step-by-step guide.</b></p>');
diff --git a/package.json b/package.json
index 9e52c4aa98f..8d7664b3730 100644
--- a/package.json
+++ b/package.json
@@ -39,13 +39,13 @@
     "compressible": "^2.0.9",
     "compression": "^1.6.2",
     "electron": "^1.6.1",
+    "eslint": "^4.0.0",
     "eslint-plugin-html": "^3.0.0",
     "event-stream": "^3.3.4",
     "express": "^4.15.0",
     "globby": "^6.1.0",
     "glsl-strip-comments": "^1.0.0",
     "gulp": "^3.9.1",
-    "gulp-eslint": "^4.0.0",
     "gulp-insert": "^0.5.0",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
@@ -83,8 +83,7 @@
     "requirejs": "gulp requirejs",
     "generateDocumentation": "gulp generateDocumentation",
     "instrumentForCoverage": "gulp instrumentForCoverage",
-    "eslint": "gulp eslint",
-    "eslint-watch": "gulp eslint-watch",
+    "eslint": "eslint ./**/*.js ./**/*.html --cache --quiet",
     "makeZipFile": "gulp makeZipFile",
     "minify": "gulp minify",
     "minifyRelease": "gulp minifyRelease",