zsh history sharing is annoying (esp. with tmux)
Merge branch 'master' into activevideo