Set up ls to use .dircolors
Merge branch 'master' into mac
Changed .bashrc to use GNU coreutils for Mac