Merge
Merge branch 'master' of github.com:Jens84/Turbot

Conflicts:
	turbot/core.py
Merge