Use Kaleidoscope as git diff/merge tool.
Remove git automerge and elasticsearch aliases.
Add alias to fix dupes in Finder's "Open With" menu.
Add auto-generated Node completion junk.
Merge branch 'master' of github.com:rgrove/dotfiles
Alphabetize.