Add Kaleidescope as mergetool
Cleanup