Set CLICOLOR=1, clean up aliases
Merge branch 'master' of https://github.com/alykhank/dotfiles