Merge branch 'master' into docs_derp

Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js

docs-assets/js/application.js

@@ -12,19 +12,19 @@
 
 !function ($) {
 
-  $(function(){
+  $(function () {
 
     // IE10 viewport hack for Surface/desktop Windows 8 bug
     //
     // See Getting Started docs for more information
     if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
-      var msViewportStyle = document.createElement("style");
+      var msViewportStyle = document.createElement('style');
       msViewportStyle.appendChild(
         document.createTextNode(
-          "@-ms-viewport{width:auto!important}"
+          '@-ms-viewport{width:auto!important}'
         )
       );
-      document.getElementsByTagName("head")[0].
+      document.getElementsByTagName('head')[0].
         appendChild(msViewportStyle);
     }
 
@@ -73,29 +73,23 @@
 
     // tooltip demo
     $('.tooltip-demo').tooltip({
-      selector: "[data-toggle=tooltip]",
-      container: "body"
+      selector: '[data-toggle=tooltip]',
+      container: 'body'
     })
 
     $('.tooltip-test').tooltip()
     $('.popover-test').popover()
 
     $('.bs-docs-navbar').tooltip({
-      selector: "a[data-toggle=tooltip]",
-      container: ".bs-docs-navbar .nav"
+      selector: 'a[data-toggle=tooltip]',
+      container: '.bs-docs-navbar .nav'
     })
 
-    // $('.bs-masthead').popover({
-    //   selector: ".btn-lg",
-    //   trigger: "hover",
-    //   placement: "top"
-    // })
-
     // popover demo
     $("[data-toggle=popover]").popover()
 
     // button state demo
-    $('#fat-btn')
+    $('#loading-example-btn')
       .click(function () {
         var btn = $(this)
         btn.button('loading')
@@ -103,6 +97,6 @@
           btn.button('reset')
         }, 3000)
       })
-})
+  })
 
-}(window.jQuery)
+}(jQuery)