fix cli/config file merging
Merge pull request #191 from tsloughter/master

fix cli/config file merging