Updated to run with Bukkit 1.5.2