rake convert
bump version to v3.3.1
Remove Rails 3.2 instructions
readme mincer typo [ci skip]
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/stylesheets/bootstrap/_button-groups.scss
	assets/stylesheets/bootstrap/_jumbotron.scss