Merge tag 'v3.3.1' of https://github.com/twbs/bootstrap-sass

v3.3.1

* Variables override template at
templates/project/_bootstrap-variables.sass
* Readme: Bower + Rails configuration

Conflicts:
	.gitignore
	assets/stylesheets/bootstrap/_buttons.scss
	assets/stylesheets/bootstrap/_code.scss
	assets/stylesheets/bootstrap/_dropdowns.scss
	assets/stylesheets/bootstrap/_glyphicons.scss
	assets/stylesheets/bootstrap/_navbar.scss
	assets/stylesheets/bootstrap/_progress-bars.scss
	assets/stylesheets/bootstrap/_theme.scss
	assets/stylesheets/bootstrap/_variables.scss
	assets/stylesheets/bootstrap/bootstrap.scss
	lib/bootstrap-sass/version.rb