Stuff i did at work
Merge branch 'master' of https://github.com/fdefitte/mojito

Conflicts:
	mojito/favorbot/mojito2.py
	mojito/favorbot/twitter_follow_bot2.py
	twitter_follow_bot.pyc