Bug fixes and stuff
Merge branch 'master' of git@github.com:Heufneutje/HeufyBot.git

Conflicts:
	src/org/pircbotx/impl/HeufyBotStarter.java