zsh: once more with oh-my-zsh
Merge remote-tracking branch 'origin/master'

* origin/master:
  bootstrap: install oh-my-zsh