Code cleanup
Merge pull request #4 from kezz101/master

Bukkit Core Cleanup