Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json

package.json

@@ -1,7 +1,7 @@
 {
     "name": "bootstrap"
   , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
-  , "version": "2.1.1-j2"
+  , "version": "2.2.1-j3"
   , "keywords": ["bootstrap", "css"]
   , "homepage": "http://jasny.github.com/bootstrap/"
   , "author": "Arnold Daniels <arnold@jasny.net>"