Added Kaleidoscope as difftool and specified GPG key
Added OS X locale fix