ls options
Merge branch 'master' into macbook
macbook git-completion, PATH