More enabling...
Merge branch 'master' of https://github.com/jcriner/emacs

This merge fixes some trivial conflict.
Minor itch update