fix twitter bug
Merge branch 'master' into twitter_is_optional_too

Conflicts:
	Gemfile