--color=auto wont work on Darwin, but -G does the same
Merge branch 'master' of github.com:phillipoertel/dotfiles