fixed dircolors
Merge remote-tracking branch 'origin/master' into mac

Conflicts:
	.bash/bash_functions