Remove gitconfig example. Add Kaleidescope as mergetool. Clean whitespace.