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