merged mod code to this repository. moved plugin code to bukkit/