Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache

diff --cc docs/index.html
index 1e4b4a270bc7c952eda1076fd12544dfb2ac493a,01dae8e6dcf18d5533943d70150fe00ce024853d..2bbcaa78aad986ae4872923bfc4ddd0c061fcf0f
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -99,12 -99,12 +99,6 @@@
            <li>
              <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
            </li>
--<!--
--          <li><strong>Authors</strong></li>
--          <li><a href="http://twitter.com/mdo">@mdo</a></li>
--          <li><a href="http://twitter.com/fat">@fat</a></li>
-- -->
--
            <li class="divider">&middot;</li>
            <li class="follow-btn">
              <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>

diff --cc docs/templates/pages/index.mustache
index 899d721b0e703f1b2b180bba22c38cf9c5d75e68,dbe30443e578854a8e61080a8eb34bd160226b9f..82307eec70fbf25e7c9a01cecf1ff6b5164c0b74
--- 1/docs/templates/pages/index.mustache
--- 2/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -39,15 -39,15 +39,9 @@@
            <li>
              <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
            </li>
--<!--
-           <li><strong>Authors</strong></li>
 -          <li><strong>{{_i}}Authors{{/i}}</strong></li>
--          <li><a href="http://twitter.com/mdo">@mdo</a></li>
--          <li><a href="http://twitter.com/fat">@fat</a></li>
-- -->
--
            <li class="divider">&middot;</li>
            <li class="follow-btn">
-             <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>
+             <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
            </li>
            <li class="tweet-btn">
              <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>