Updated to use 1.6 R1 CraftBukkit.