language elisp stuff
Merge pull request #1 from gabanjo/testbranch

language elisp stuff