Update .emacs to include latest changes
Update .zshrc to latest