Merge branch 'master' into docs_derp

Conflicts:
	_config.yml

docs-assets/css/docs.css

@@ -32,6 +32,7 @@
  * Miscellaneous
  */
 
+/*csslint ids: false, fallback-colors: false*/
 
 /*
  * Scaffolding
@@ -704,7 +705,7 @@ h1[id] {
 .bs-team .github-btn {
   float: right;
   margin-top: 6px;
-  width: 120px;
+  width: 180px;
   height: 20px;
 }
 .bs-team img {
@@ -729,8 +730,8 @@ h1[id] {
   padding-top: 10px;
   padding-bottom: 10px;
   background-color: #eee;
-  border: 1px solid #ddd;
   background-color: rgba(86,61,124,.15);
+  border: 1px solid #ddd;
   border: 1px solid rgba(86,61,124,.2);
 }
 

docs-assets/js/application.js

@@ -59,8 +59,8 @@
             var navOuterHeight = $('.bs-docs-nav').height()
 
             return (this.top = offsetTop - navOuterHeight - sideBarMargin)
-          }
-        , bottom: function () {
+          },
+          bottom: function () {
             return (this.bottom = $('.bs-footer').outerHeight(true))
           }
         }

docs-assets/js/customizer.js

@@ -9,7 +9,7 @@
 
 window.onload = function () { // wait for load in a dumb way because B-0
   var cw = '/*!\n' +
-           ' * Bootstrap v3.1.0 (http://getbootstrap.com)\n' +
+           ' * Bootstrap v3.0.3 (http://getbootstrap.com)\n' +
            ' * Copyright 2013 Twitter, Inc.\n' +
            ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
            ' */\n\n';
@@ -227,9 +227,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
     try {
       var parser = new less.Parser({
-          paths: ['variables.less', 'mixins.less']
-        , optimization: 0
-        , filename: 'bootstrap.css'
+          paths: ['variables.less', 'mixins.less'],
+          optimization: 0,
+          filename: 'bootstrap.css'
       }).parse(css, function (err, tree) {
         if (err) {
           return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)