Added Kaleidoscope as the default diff/merge tool
Improved shift-key prohibitions to allow shift + modifier + keys