Make Kaleidoscope git's diff and merge tool
Add text bubbling commands to vimrc
Merge remote-tracking branch 'origin/master'