Merge remote-tracking branch 'upstream/master'
Imporve history search bindings
Merge branch 'master' of github-serebrov:serebrov/oh-my-zsh