Fix default config filename, and add a test.
Merge pull request #241 from dnephin/0.6.1_overlapping_configs_because_of_cace

Fix default config filename, and add a test.