Fix 'op' on mac
Merge branch 'master' of github.com:johndgiese/config