Update Bukkit for Minecraft 1.6.2
Merge remote-tracking branch 'upstream/master'