Merge branch 'master' of github.com:twbs/bootstrap

README.md

@@ -56,7 +56,7 @@ Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working
 From the command line:
 
 1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
-2. Install the [necessary local dependencies](package.json) via `npm install`
+2. From the root `/bootstrap` directory, install the [necessary local dependencies](package.json) via `npm install`.
 
 When completed, you'll be able to run the various Grunt commands provided from the command line.
 

package.json

@@ -22,16 +22,16 @@
   , "devDependencies": {
       "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
-    , "grunt-contrib-connect": "~0.4.0"
+    , "grunt-contrib-connect": "~0.4.1"
     , "grunt-contrib-concat": "~0.3.0"
-    , "grunt-contrib-copy": "~0.4.0"
-    , "grunt-contrib-jshint": "~0.6.0"
-    , "grunt-contrib-uglify": "~0.2.2"
+    , "grunt-contrib-copy": "~0.4.1"
+    , "grunt-contrib-jshint": "~0.6.4"
+    , "grunt-contrib-uglify": "~0.2.4"
     , "grunt-contrib-qunit": "~0.2.2"
-    , "grunt-contrib-watch": "~0.5.1"
-    , "grunt-html-validation": "~0.1.4"
-    , "grunt-jekyll": "~0.3.8"
-    , "grunt-recess": "~0.3.3"
-    , "browserstack-runner": "~0.0.11"
+    , "grunt-contrib-watch": "~0.5.3"
+    , "grunt-html-validation": "~0.1.5"
+    , "grunt-jekyll": "~0.3.9"
+    , "grunt-recess": "~0.4.0"
+    , "browserstack-runner": "~0.0.12"
   }
 }