OS X emacs settings.
Merged with HEAD