Added logging.
Merge branch 'master' into devel-logger
Finished off logging.
Merge branch 'master' into devel

Conflicts:
	infbot/infbot.py
	requirements.txt