Allow command line overrides to always work
Merge pull request #26 from rspieldenner/command_line_override

Allow command line overrides to always work