.DS_Store is the worst though

add "ours" merge strategy & a couple aliases

log vim keystrokes, add stuff to cdpath, more standard prompt format

back to 4space tabs, better colors, better statusline (but will break w/o fugitive installed)

add 'v' & 'y' to select/yank in copy mode, and better distinguish active pane via blue bg

bring some customizations from work machine back to the repo. new statusline, mostly.