Merge new config file format.

This solves issue #5 and issue #9.