Changed some of the linux LS_COLORS
Merge remote-tracking branch 'origin/master'