mac-emacs
Merge branch 'master' of github.com:graehl/.emacs.d
pulled magit -