spring cleaning: remove dubious config entries
remove kaleidoscope as diff/merge-tool because trial has ended