Use combined as a default for $format_log
add/update tests for #462
Merge pull request #462

better default for format_log

Closes #462