Fix dircolors
Merge branch 'master' into osx

Conflicts:
	.bash_global