Add dir_colors
Clean up
Clean up
Merge branch 'master' of github.com:mdesrosiers/dotfiles

Conflicts:
  zshenv.erb
  zshrc