Allow args to be passed through to ArgumentParser.parse_args
Fix issue with --rename. Construct the dict from pairs collected in the parser.
Merge with refactor