try putting colors back
Merge branch 'master' of github.com:kmulvey/dotfiles