Issue #12: CLI options should win.
Apply Needs Review behaviour in non-interactive mode.
Merge pull request #16 from webflo/cli-should-win

Cli options should always override other options