Support reading config file from command line option

Use '-c <file>' to load conf from alternative location
Merge branch 'add-config-option'