Upstream Bukkit and Craftbukkit will go here