various changes to .emacs and .zshrc