Clean up colors/aliases
Merge branch 'master' of https://github.com/danbrady/dotfiles