add Kaleidoscope as difftool and mergetool, add github stuff, slightly tweak settings based on my old gitconfig
add Kaleidoscope as difftool and mergetool, add github stuff, slightly tweak settings based on my old gitconfig

mattbanks/dotfiles,mattbanks/dotfiles