Add Sublimerge settings to gitconfig
Update dotfiles, vim, and gvim aliases
Add gvim to homebrewed packages
Add jitouch to brew cask list