Prefer CLI filter options to those in files
Merge pull request #1602 from trptcolin/filter_overriding

Prefer CLI filter options to those in files