Merge branch 'twitter-avatar-promotion' into remove-twitter-avatar

:sob:

Conflicts:
	app/models/twitter_avatar_promotion.rb
	spec/models/twitter_avatar_promotion_spec.rb
Merge branch 'remove-twitter-avatar' into remove-twitter-avatar-column