Merge branch 'master' into upgrade-mitm

Gruntfile.js

@@ -4,6 +4,7 @@ module.exports = function(grunt) {
   require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
   require('matchdep').filter('grunt-*').forEach(grunt.loadNpmTasks);
 
+  var fs = require('fs');
   var path = require('path');
   var changeCase = require('change-case');
   var webpack = require('webpack');
@@ -18,7 +19,10 @@ module.exports = function(grunt) {
   };
 
   // Read in package.json and layer on some grunt-specific properties
-  var rollbar = grunt.file.readJSON('rollbar.json');
+  var rollbar = {};
+  if (fs.existsSync('rollbar.json')) {
+    rollbar = grunt.file.readJSON('rollbar.json');
+  }
 
   var getBuiltFilesArray = function(type, dest) {
     var srcPattern = type === 'js' ? '**/*.js' : '**/*!(.js)';

package.json

@@ -73,7 +73,7 @@
     "style-loader": "~0.6.4",
     "vibe": "~0.9.4",
     "webpack": "~1.3.0-beta5",
-    "webpack-dev-server": "^1.16.5",
+    "webpack-dev-server": "^1.7.0",
     "xmlhttprequest": "~1.6.0",
     "zeroclipboard": "~1.1.7"
   },