diff --git a/.travis.yml b/.travis.yml
index 9e6209779..ad1107b81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ branches:
   only:
     - master
     - dev
-    - issue/438-runAllTestsTravis
 
 notifications:
   webhooks:
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index be14760e5..000000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = function (grunt) {
-
-  /******************************
-   * Project configuration.
-   * Should only be needed if you are developing against core, running tests, linting and want to run tests or increment package numbers
-   *****************************/
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    concat: {
-      options: {
-        stripBanners: true,
-        banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author.name %>, <%= pkg.contributors[0].name %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
-      },
-      patternlab: {
-        src: './core/lib/patternlab.js',
-        dest: './core/lib/patternlab.js'
-      }
-    },
-    tape: {
-      options: {
-        pretty: false,
-        output: 'console'
-      },
-      files: ['test/*_tests.js']
-    },
-    eslint: {
-      options: {
-        configFile: './.eslintrc'
-      },
-      target: ['./core/lib/*']
-    }
-  });
-
-  // load all grunt tasks
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-eslint');
-  grunt.loadNpmTasks('grunt-tape');
-
-  //travis CI task
-  grunt.registerTask('travis', ['tape', 'eslint']);
-
-  //to be run prior to releasing a version
-  grunt.registerTask('build', ['tape', 'eslint', 'concat']);
-
-};
diff --git a/core/lib/object_factory.js b/core/lib/object_factory.js
index ff68a9e5b..29b637e4d 100644
--- a/core/lib/object_factory.js
+++ b/core/lib/object_factory.js
@@ -3,6 +3,7 @@
 var patternEngines = require('./pattern_engines');
 var path = require('path');
 var extend = require('util')._extend;
+
 // patternPrefixMatcher is intended to match the leading maybe-underscore,
 // zero or more digits, and maybe-dash at the beginning of a pattern file name we can hack them
 // off and get at the good part.
diff --git a/package.json b/package.json
index de331975f..7ea94ec6a 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,7 @@
     "patternengine-node-mustache": "^1.0.0"
   },
   "devDependencies": {
-    "grunt": "~1.0.1",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-eslint": "^18.0.0",
-    "grunt-tape": "^0.1.0",
+    "eslint": "^3.5.0",
     "tap": "^7.1.2"
   },
   "keywords": [
@@ -45,7 +42,8 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "node_modules/grunt/bin/grunt travis --verbose"
+    "test": "eslint core/**/*.js && tap test/*_tests.js --reporter spec",
+    "lint": "eslint core/**/*.js"
   },
   "engines": {
     "node": ">=4.0"