Merge Bukkit and Core