Use dircolors and linux ls in osx
Merge branch 'master' into osx
Fix OSX specific ls
Merge branch 'master' into osx
Remove redundant alias