reworked to allow arbitrary config file names/locations
Merge branch 'config-file'