updates
Merge branch 'master' of bitbucket.org:cmcmahan/elisp
Merge branch 'master' of bitbucket.org:cmcmahan/elisp
updated OSX faces
Merge branch 'master' of bitbucket.org:cmcmahan/elisp