Adept to changes in the emacs environment.
Merge branch 'master' of github.com:tomterl/zshorg