Merge branch 'master' into docs_derp

Conflicts:
	docs/components.html

diff --cc docs/components.html
index 503b612f6471d105dae602d3c26464139a180621,ad7eb079cc2aa5243d4f4ccad01b65696a0c09aa..b81b7493734058d5a6cf1af9421e5dc319a31971
--- 1/docs/components.html
--- 2/docs/components.html
+++ b/docs/components.html
@@@ -14,8 -14,7 +14,7 @@@ lead: "Over a dozen reusable component
      </div>
  
      <h2 id="glyphicons-glyphs">Available glyphs</h2>
-     <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
- 
 -    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
++    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
      <div class="bs-glyphicons">
        <ul class="bs-glyphicons-list">
          {% for iconClassName in site.data.glyphicons %}

diff --cc docs/css.html
Simple merge

diff --cc docs/getting-started.html
Simple merge