Add craftbukkit and bukkit from the java overlay with different versioning scheme

Needs java-overlay for some dependencies