Add emacs daemon/client, comment out OSX specifics