add a command-line option to specify a different config file
Sample configuration file
test command line options
Make format
Ignore JSON files mangled by acceptance tests
Merge branch 'wip-config-nondefault'

Conflicts:
	tests/data/retcon.conf