Updated to bukkit 1.6