update zshrc, etc
With beautiful emoji
Merge remote-tracking branch 'origin/master'
cleaned up .emacs