style
Merge branch 'master' of ssh://github.com/euclio/auto-gif

Conflicts:
	bot.py
Merge branch 'master' of ssh://github.com/euclio/auto-gif

Conflicts:
	bot.py