Merge branch 'master' into firefox-alt-key

Gruntfile.js

@@ -8,7 +8,8 @@ module.exports = function(grunt) {
         mocha: {
             options: {
                 reporter: 'Nyan',
-                run: true
+                run: true,
+                growlOnSuccess: false
             },
             mousetrap: {
                 src: ['tests/mousetrap.html']

README.md

@@ -21,9 +21,9 @@ It has support for ``keypress``, ``keydown``, and ``keyup`` events on specific k
     ```html
     <script src="/path/to/mousetrap.min.js"></script>
     ```
-    
+
     or install `mousetrap` from `npm` and require it
-    
+
     ```js
     var Mousetrap = require('mousetrap');
     ```
@@ -79,7 +79,7 @@ Unit tests run via <a href="http://mochajs.org/" target="_blank">mocha</a>.
 
 ### Running in browser
 
-[View it online](http://rawgit.com/ccampbell/mousetrap/master/tests/mousetrap.html) to check your browser compatibility. You may also download the repo and open `tests/mousetrap.html` in your browser. 
+[View it online](http://rawgit.com/ccampbell/mousetrap/master/tests/mousetrap.html) to check your browser compatibility. You may also download the repo and open `tests/mousetrap.html` in your browser.
 
 ### Running with Grunt and PhantomJS
 
@@ -99,7 +99,7 @@ Unit tests run via <a href="http://mochajs.org/" target="_blank">mocha</a>.
 3.  Run tests
 
     ```bash
-    grunt mocha
+    npm test
     ```
 
 ## Documentation

package.json

@@ -23,8 +23,8 @@
   "gitHead": "c202a0bd4967d5a3064f9cb376db51dec9345336",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-complexity": "~0.1.2",
-    "grunt-mocha": "~0.3.1"
+    "grunt": "~1.0.3",
+    "grunt-complexity": "~1.1.0",
+    "grunt-mocha": "~1.1.0"
   }
 }