CLI args take precedence over local configuration files
Merge pull request #3 from abehling/option_fix

CLI args take precedence over local configuration files