fixed dircolors
Merge branch 'master' into ubuntu