Merge bukkit r0.2 update from Libigot/Libigot