Update config file
Merge branch 'master' into feature/halomerge
Update config to deal with HaloPlexCombine. Fixes issue #2
Merge branch 'feature/halomerge' into develop