Changed configuration file format to reflect Kevin's new format