Update CraftBukkit to Minecraft 1.7.2
Merge remote-tracking branch 'upstream/master' into custom