Merge branch 'master' into jonschlinkert/master

diff --cc docs/_includes/customizer-variables.html
index e3e3dab39599e5687ae654e9d8ac0df280ac7b03,cd98145139870e96e326c086914f3a8ebd8988b2..89edc603de75381bb2a6c84ef54aad372a017d16
--- 1/docs/_includes/customizer-variables.html
--- 2/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@@ -295,9 -312,9 +312,9 @@@
    </div>
  </div>
  <h2 id="buttons">Buttons</h2>
 -<p>For each of Bootstrap&#39;s buttons, define text, background and border color.</p>
 +<p>For each of Bootstrap's buttons, define text, background and border color.</p>
  <div class="row">
-   <div class="bs-customizer-input">
+   <div class="col-xs-4">
      <label for="input-@btn-font-weight">@btn-font-weight</label>
      <input id="input-@btn-font-weight" type="text" value="normal" data-var="@btn-font-weight" class="form-control"/>
    </div>

diff --cc grunt/bs-lessdoc-parser.js
Simple merge