Added Kaleidoscope as merge tool and added branch aliases
Merge branch 'master' of github.com:afterdesign/dotfiles