Added Kaleidoscope as diff and merge tool.