alias hub without all the junk
I don't do that ruby stuff
[git] remove aliases already in the $PATH
[git] add aliases (un)assume(d), snapshot, ours, theirs

from http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/
[git] ignore vim generated doc/tags
use /usr/local/php5, not ~/pear