ls options are different in OSX and Linux
Merge branch 'master' of github.com:anders-dc/dotfiles