Reinstate command line flags for variable and property output maps, but rename the options to indicate that they are only reports.
Merge pull request #458 from ChadKillingsworth/reinstate-var-and-prop-renaming-file

Reinstate command line flags for variable and property output maps