fix git diff/merge settings?
Where did this git-media shit come from?
Cool new vim mappings
zsh completion things recommended by brew?