merge configuration file

[fwang2]

Here is a suggestion, correct me if I miss something - I think maintaining two config files is a chore and unwieldy. [dist] could be just another section in the single config. In the [setup] or whatever section, an option can be provided as:

follow_dist = [0 | 1]

this will enable or disable if it needs to read in dist.