Fix merging when value exists in both config.json and config.private.json.
Merge branch 'master' of git+ssh://github.com/timvideos/timvideos