Switched to elpa
Merge branch 'master' of github.com:oneself/emacs