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

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

docs/extend.html

@@ -159,7 +159,7 @@
         <h3>Unofficial Mac app</h3>
         <p><a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file. If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.</p>
 
-        <h3>More Mac apps</h3>
+        <h3>More apps</h3>
         <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
         <p>Crunch is a great looking LESS editor and compiler built on Adobe Air.</p>
         <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
@@ -237,6 +237,7 @@
     </div>
   </div>
 
+
 </div>
 
 

docs/templates/pages/extend.mustache

@@ -88,7 +88,7 @@
         <h3>{{_i}}Unofficial Mac app{{/i}}</h3>
         <p>{{_i}}<a href="http://incident57.com/less/">The unofficial Mac app</a> watches directories of .less files and compiles the code to local files after every save of a watched .less file. If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}</p>
 
-        <h3>{{_i}}More Mac apps{{/i}}</h3>
+        <h3>{{_i}}More apps{{/i}}</h3>
         <h4><a href="http://crunchapp.net/" target="_blank">Crunch</a></h4>
         <p>{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}</p>
         <h4><a href="http://incident57.com/codekit/" target="_blank">CodeKit</a></h4>
@@ -166,4 +166,5 @@
     </div>{{! /span9 }}
   </div>{{! row}}
 
+
 </div>{{! /container }}