shell: If using Mac, override ls with gls
Merge remote-tracking branch 'origin/master' into linux