Set emacsclient appropriately on Mac and Linux
Merge branch 'master' of github.com:pjlegato/config-files