Clarify that --criteria takes preference over OPAMCRITERIA.
Merge pull request #1210 from rdicosmo/add-cmdline-options

Clarify that --criteria takes preference over OPAMCRITERIA.