Use private Bukkit/CraftBukkit fork in the mean time
Apply patches to current build branch, require clean work tree