Add CanaryBukkit to server-definitions list
Merge branch 'patch-1' of https://github.com/lexware/MCStats

Conflicts:
	server-definitions.txt