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

diff --cc docs/assets/js/application.js
index 5fe8b53ef4985caa5bd049cb83b8cb3163b39442,6194b88db543921dbb3ed6974256338c1168e6d2..c31fc97a066d71198f4931954a8082268d04f23d
--- 1/docs/assets/js/application.js
--- 2/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@@ -9,21 -9,12 +9,12 @@@ $(function()
    // ==============================================
  
    // Set a timeout...
 -  setTimeout(function(){
 -    // Hide the address bar!
 -    window.scrollTo(0, 1);
 -  }, 0);
 +  // setTimeout(function(){
 +  //   // Hide the address bar!
 +  //   window.scrollTo(0, 1);
 +  // }, 0);
  
  
-   // Docs topbar nav
-   // ===============
- 
-   $('.nav .active').on('click', function (e) {
-     e.preventDefault()
-     $(this).siblings().toggle()
-   });
- 
- 
    // table sort example
    // ==================