Update Bukkit for Minecraft 1.6.1
Add scale health display API. Adds BUKKIT-4432
Merge remote-tracking branch 'upstream/master'