bukkit upgrade + some work on director plugin