[git] 'git ll', like 'git l' but hiding merges
[vim] Set ts=8
[vim] Put swap files in ~/.vim/swap/
[iterm] Add colour scheme