Attempt to fix imports
Merge branch 'master' into importfix

Conflicts:
	desertbot/modulehandler.py
Merge in the rest of the changes from master
Merge branch 'importfix'