Change command-line help flag to -h.
Merge remote-tracking branch 'mitcrpgopenmc/develop' into res_scat