Adjustments to emacs and zsh
Merge