Gracefully cleanup tmp config files when non-cli options are specified.
Merge pull request #175 from ryan953/gracefully-cleanup-tmp-files

Gracefully cleanup tmp config files when non-cli options are specified.