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

Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache

docs/templates/layout.mustache

@@ -121,6 +121,7 @@
     <script src="assets/js/bootstrap-collapse.js"></script>
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
+    <script src="assets/js/bootstrap-affix.js"></script>
     <script src="assets/js/application.js"></script>
 
     {{#production}}

docs/templates/pages/base-css.mustache

@@ -7,7 +7,6 @@
   </div>
 </header>
 
-
 <div class="bs-docs-canvas">
 
   <div class="container">

docs/templates/pages/customize.mustache

@@ -25,7 +25,6 @@
       <div class="span9">
 
 
-
         <!-- Customize form
         ================================================== -->
         <form>

docs/templates/pages/extend.mustache

@@ -14,7 +14,7 @@
   ================================================== -->
   <div class="row">
     <div class="span3 bs-docs-sidebar">
-      <ul class="nav nav-list bs-docs-sidenav">
+      <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
         <li><a href="#built-with-less">{{_i}}Built with LESS{{/i}} <i class="icon-chevron-right"></i></a></li>
         <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}} <i class="icon-chevron-right"></i></a></li>
         <li><a href="#static-assets">{{_i}}Use as static assets{{/i}} <i class="icon-chevron-right"></i></a></li>