Rework config

Also fix #632. Use meld for better diff view.