First iteration of twitter iteration
Merge branch 'twitter_integration' into 2-2-stable

Conflicts:
	Gemfile.lock