Squashed 'scripts/upandaway/wicker/' changes from 484f7ef..21fdd39

21fdd39 bug fixed in cfg

git-subtree-dir: scripts/upandaway/wicker
git-subtree-split: 21fdd398c77ced69c3efaecbbd6c0c678c4b9d33
Bug fixed in cfg (I had forgotten to erase some old code).