Merge pull request #2 from mathiask/master

Elisp updates
play on emacs server