Merge branch 'noahblon-master' into 2.0.1-wip

Conflicts:
	docs/assets/bootstrap.zip

diff --cc docs/assets/bootstrap.zip
index 32afa3a0225e7cf27bbdaf466a97197f4e733a4f,57c5130347fc21c3031d2953b3497406b330aa79..91279e1ac25ac3ef870e04ad3208a1cb16b83cb7
Binary files differ

diff --cc docs/base-css.html
Simple merge

diff --cc docs/download.html
index 8442dcad1efb1f457eb65b7b8238419ca7e92485,1765b8a7d163e186e9d1ccaf542d85ed9295b4c9..c385046dd4501afa5d19e6b25950ebb0ff3faded
--- 1/docs/download.html
--- 2/docs/download.html
+++ b/docs/download.html
@@@ -93,7 -93,7 +93,7 @@@
    <div class="page-header">
      <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
      <h1>
--      1. Chose components
++      1. Choose components
        <small>Get just the CSS you need</small>
      </h1>
    </div>

diff --cc docs/javascript.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge