Fix conflicts to update to latest Bukkit, yay fluff.