Add Kaleidoscope as the default merge & diff handler; remove all the nasty extra spaces
Merge branch 'master' of github.com:BrettBukowski/dotfiles