Merge branch 'reversefold-master' into 3.0.0-wip

Conflicts:
	README.md

diff --cc README.md
index 1cf79d3bf044c0f1157ff1e2d46c61bd63b5c924,c4a008d39e58c864b3d78b487b82d1b4e18642c5..3ecafb6f1f93a07174621a667389e571fef7623a
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -51,16 -65,16 +51,16 @@@ $ npm instal
  
  When completed, you'll be able to run the various make commands provided:
  
 -#### build - `make`
 -Runs the recess compiler to rebuild the `/less` files and compiles the docs. Requires recess and uglify-js.
 +#### build - `make` or `make bootstrap`
 +`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. `make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
  
  #### test - `make test`
 -Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
 +Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
  
  #### watch - `make watch`
- This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the Watchr gem.**
 -This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the watchr gem.
++This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the watchr gem.**
  
 -Should you encounter problems with installing dependencies or running the makefile commands, be sure to first uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
 +Should you encounter problems with installing dependencies or running the makefile commands, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.