Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/base-css.html
Simple merge

diff --cc docs/customize.html
Simple merge

diff --cc docs/javascript.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc docs/templates/pages/customize.mustache
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge