Code cleanup
Merge branch 'master' of /home/matt/lib/../src/bot-core

Conflicts:
	src/main/groovy/bot/control/ServiceManager.groovy
Merge branch 'master' of /home/matt/lib/../src/bot-core

Conflicts:
	src/main/groovy/bot/control/ServiceManager.groovy