Improved gitconfig with kaleidoscope
Some minor issues
Some new aliases
Mergetool is now opendiff