Merge branch 'master' into docs_derp

Conflicts:
	_config.yml

_includes/header.html

@@ -24,12 +24,12 @@
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.ico">
 
 <script>
   var _gaq = _gaq || [];

_includes/nav-about.html

@@ -2,7 +2,7 @@
   <a href="#history">History</a>
 </li>
 <li>
-  <a href="#team">Core team</a>
+  <a href="#team">Team</a>
 </li>
 <li>
   <a href="#community">Community</a>

_includes/nav-css.html

@@ -110,7 +110,7 @@
   </ul>
 </li>
 <li>
-  <a href="#less">Using LESS</a>
+  <a href="#less">Using Less</a>
   <ul class="nav">
     <li><a href="#less-bootstrap">Compiling Bootstrap</a></li>
     <li><a href="#less-variables">Variables</a></li>
@@ -118,3 +118,13 @@
     <li><a href="#less-mixins-utility">Utility mixins</a></li>
   </ul>
 </li>
+<li>
+  <a href="#sass">Using Sass</a>
+  <ul class="nav">
+    <li><a href="#sass-contents">What's included</a></li>
+    <li><a href="#sass-installation-rails">Rails install</a></li>
+    <li><a href="#sass-installation-compass">Compass install</a></li>
+    <li><a href="#sass-installation-sass-only">Sass install</a></li>
+    <li><a href="#sass-usage">Usage</a></li>
+  </ul>
+</li>