Merge pull request #729 from jonas054/fix_descriptions

Make sure config descriptions don't have trailing newlines.
Fix parsing of the --no-color option.