git: use Kaleidoscope for diffs + merges, re-arrange config