Cleanup.
Merge branch 'master' of github.com:zentrope/.emacs.d