add snorkel to ssh aliases
add nas3 to aliases
Add nye. Add (broken) Vim-pager stuff.
Add .ackrc
Add supercharged git log aliases
Add external diff (vim -d) to .gitconfig
misc additions/changes
Use 'patience' diff algorithm for git
Add command-t vim plugin
Change <Leader>t to open command-t in a new split
Merge branch 'osx_cole_inigral'
Adding changes from Inigral branch
Merge branch 'osx_detune' of github.com:coledot/dotfiles into osx_detune

Conflicts:
	.bashrc