Better job of combining DESCRTIPION defaults
with user settings. Fixes #332