Cleanup help messages for --criteria.
Better alignment of help message.
Merge pull request #1209 from rdicosmo/add-cmdline-options

Cleanup help messages for --criteria.