Mention some extra config for terminal Emacs
Merge branch 'refs/heads/master' into working