Set up ls to use .dircolors
Merge branch 'master' into windows