Updating for Bukkit 1.5.1-R0.1
Merge branch 'bukkit1_5' into beta