Merge branch 'v3.4.0-dev' of https://github.com/twbs/bootstrap-3 into v3.4.0-dev

diff --cc _config.yml
index 67439a76b5674f2f1c70684273e50d32cbd3c290,83e4121daf484c4e26e0b9dbb02f622689738e5d..d74da67fc293e9dad29472e19d4828981d6bc116
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -9,8 -9,7 +9,7 @@@ permalink:        prett
  source:           docs
  destination:      _gh_pages
  host:             0.0.0.0
 -port:             3001
 +port:             9001
- baseurl:          ""
  url:              http://getbootstrap.com
  baseurl:          /docs/3.4
  encoding:         UTF-8