Squashed 'wicker/' changes from e7c8eeb..1ba2e3a

1ba2e3a fixed missing import
b1c1a13 geometry tweaks

git-subtree-dir: wicker
git-subtree-split: 1ba2e3aab7e94582ce19eba0068371388fdc3290
Missing import in wicker. :P
Squashed 'wicker/' changes from 1ba2e3a..7ece8fb

7ece8fb bug fix at searchspace.lua

git-subtree-dir: wicker
git-subtree-split: 7ece8fb4f3657952069456fcdc4b346949a4228f
Missing assignment in wicker.
Implemented shopkeeper spawning on road