Update gitconfig.symlink

* Add ksdiff (Kaleidoscope) as  a difftool
* Add ksdiff (Kaleidoscope) as  a mergetool
* Move things around