yay
Merge branch 'master' of github.com:flyingmachine/emacs.d