Updated to Bukkit 1.6