Definition class
Merge branch 'master' of github.com:Jens84/dmup

Conflicts:
	turbot/core.py