twitter agents can be disabled too
Merge branch 'master' into twitter_is_optional_too

Conflicts:
	Gemfile
Merge branch 'twitter_is_optional_too' of https://github.com/cantino/huginn

trying to merge