pulled coffee-mode -
Merge branch 'master' of github.com:graehl/.emacs.d
pulled expand-region -