Moved some small things around, registering the WorldListener now
properly.

Added first version of the citizens NPC shopkeeper support by Nathan
Wolf (probably with some small changes). Further testing is needed: some
situations still might need to be properly thought through. This is
alpha.