Bugfix: Make sure config generation works without envvars, too
Merge pull request #357 from fh/t/fix-cookbooks

Bugfix: Make sure config generation works without envvars, too