Re-formatting using autopep8 and minor edits
Merge branch 'master' of https://github.com/tuxology/dorsalfunbot

Conflicts:
	amihot.py
	translate.py