Aliased "vi" to "echo" until to force myself to use the "v" alias.
Set colors for Git.
Merge branch 'master' of github.com:anoxic/dotfiles