Modified config files in preparation for merge.