Release 2.2.1
Merge branch '2-2-stable'

Conflicts:
	lib/sprockets/rails/version.rb
	sprockets-rails.gemspec