Merge branch 'master' into docs_derp

Conflicts:
	docs/assets/css/docs.css

13 files changed, 37 insertions, 25 deletions

diff --git a/js/.jscs.json b/js/.jscs.json
index 096da217d..313bfb690 100644
--- a/js/.jscs.json
+++ b/js/.jscs.json
@@ -3,7 +3,7 @@
   "requireLeftStickedOperators": [","],
   "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
   "requireLineFeedAtFileEnd": true,
   "requireRightStickedOperators": ["!"],
diff --git a/js/affix.js b/js/affix.js
index 91a8197b0..e3cb6a2a8 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -2,12 +2,13 @@
  * Bootstrap: affix.js v3.0.3
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // AFFIX CLASS DEFINITION
   // ======================
diff --git a/js/alert.js b/js/alert.js
index ae63210e4..357981f4f 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -2,12 +2,13 @@
  * Bootstrap: alert.js v3.0.3
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // ALERT CLASS DEFINITION
   // ======================
diff --git a/js/button.js b/js/button.js
index 80705eafd..2df193a9c 100644
--- a/js/button.js
+++ b/js/button.js
@@ -2,12 +2,13 @@
  * Bootstrap: button.js v3.0.3
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // BUTTON PUBLIC CLASS DEFINITION
   // ==============================
diff --git a/js/carousel.js b/js/carousel.js
index 7d889a0df..e1e63f8af 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -2,12 +2,13 @@
  * Bootstrap: carousel.js v3.0.3
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // CAROUSEL CLASS DEFINITION
   // =========================
diff --git a/js/collapse.js b/js/collapse.js
index 55a7be962..1857cba16 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -2,12 +2,13 @@
  * Bootstrap: collapse.js v3.0.3
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // COLLAPSE PUBLIC CLASS DEFINITION
   // ================================
diff --git a/js/dropdown.js b/js/dropdown.js
index 289014f95..a457c3758 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -2,12 +2,13 @@
  * Bootstrap: dropdown.js v3.0.3
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // DROPDOWN CLASS DEFINITION
   // =========================
diff --git a/js/modal.js b/js/modal.js
index c86cf6ccd..f6caab6bf 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -2,12 +2,13 @@
  * Bootstrap: modal.js v3.0.3
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // MODAL CLASS DEFINITION
   // ======================
diff --git a/js/popover.js b/js/popover.js
index 6f4a9cc21..386f5fd87 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -2,12 +2,13 @@
  * Bootstrap: popover.js v3.0.3
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // POPOVER PUBLIC CLASS DEFINITION
   // ===============================
diff --git a/js/scrollspy.js b/js/scrollspy.js
index 62f8dfcc5..65c45e975 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -2,12 +2,13 @@
  * Bootstrap: scrollspy.js v3.0.3
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // SCROLLSPY CLASS DEFINITION
   // ==========================
diff --git a/js/tab.js b/js/tab.js
index a0df7dd87..46a7ff1e1 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -2,12 +2,13 @@
  * Bootstrap: tab.js v3.0.3
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // TAB CLASS DEFINITION
   // ====================
diff --git a/js/tooltip.js b/js/tooltip.js
index ce9ee4c5a..a976bbf1e 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -3,12 +3,13 @@
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // TOOLTIP PUBLIC CLASS DEFINITION
   // ===============================
diff --git a/js/transition.js b/js/transition.js
index 3559c4069..45fc80f99 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -2,12 +2,13 @@
  * Bootstrap: transition.js v3.0.3
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { 'use strict';
++function ($) {
+  'use strict';
 
   // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
   // ============================================================