Made OPAMCRITERIA settable via the command line option --criteria
Merge pull request #1208 from rdicosmo/add-cmdline-options

Made OPAMCRITERIA settable via the command line option --criteria