Commiting what small I did so the Bukkit implementation libraries may be up-to-date