Merge remote-tracking branch 'upstream/master' into mergeFromUpstream

* upstream/master: (119 commits)
  Drop trailling comma
  New Year
  fix assets links in all examples
  Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes twbs#12030: navbar toggle focus state
  Fix broken JS
  derp
  Fixes twbs#12046: move .csscomb.json and .csslintrc to less/ folder
  typo
  @nschonni's feedback <3
  @cvrebert's feedback
  Update dependencies (again)
  Fixed typo
  Sauce now supports latest Firefox on OS X Mavericks
  default to latest Firefox version on OS X
  fix capitalization of iOS
  mv sauce_browsers.yml out of the project root
  add note about ios dropdown compat
  fixes twbs#11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
  fixes twbs#11373 - adds related target to dropdown events
  fixes twbs#11288 - Vertical scroll position of modal saves between openings
  ...

Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/assets/css/docs.css
	docs/assets/css/pygments-manni.css
	docs/assets/ico/apple-touch-icon-144-precomposed.png
	docs/assets/js/application.js
	docs/assets/js/customize.js
	docs/assets/js/customizer.js
	docs/assets/js/filesaver.js
	docs/assets/js/holder.js
	docs/assets/js/ie8-responsive-file-warning.js
	docs/assets/js/jszip.js
	docs/assets/js/less.js
	docs/assets/js/raw-files.js
	docs/assets/js/uglify.js
	test-infra/s3_cache.py

.editorconfig

@@ -9,3 +9,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4

CONTRIBUTING.md

@@ -18,8 +18,8 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat
 and [submitting pull requests](#pull-requests), but please respect the following
 restrictions:
 
-* Please **do not** use the issue tracker for personal support requests (use
-  [Stack Overflow](http://stackoverflow.com/) or IRC).
+* Please **do not** use the issue tracker for personal support requests.  Stack
+  Overflow ([`twitter-boostrap`](http://stackoverflow.com/questions/tagged/twitter-bootstrap) tag) or [IRC](https://github.com/twbs/bootstrap/blob/master/README.md#community) are better places to get help.
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
@@ -44,12 +44,15 @@ Guidelines for bug reports:
 
 3. **Isolate the problem** — ideally create a [reduced test
    case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
+   [This JS Bin](http://jsbin.com/EBAwOkOK/1) is a helpful template.
+
 
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report. What is
 your environment? What steps will reproduce the issue? What browser(s) and OS
-experience the problem? What would you expect to be the outcome? All these
-details will help people to fix any potential bugs.
+experience the problem? Do other browsers show the bug differently? What
+would you expect to be the outcome? All these details will help people to fix
+any potential bugs.
 
 Example:
 
@@ -103,7 +106,7 @@ included in the project:
    # Clone your fork of the repo into the current directory
    git clone https://github.com/<your-username>/bootstrap.git
    # Navigate to the newly cloned directory
-   cd html5-boilerplate
+   cd bootstrap
    # Assign the original repo to a remote called "upstream"
    git remote add upstream https://github.com/twbs/bootstrap.git
    ```