Squashed 'oh-my-zsh/' changes from 00d6ef8..eafd5f3

eafd5f3 Merge pull request #1635 from jimhester/per-directory-history
11bf1a3 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin
4509228 Merge pull request #2728 from benwong/patch-2
59de9aa Merge pull request #2671 from ukrutt/master
01dcf51 Merge pull request #2502 from UniIsland/patch-1
5eb5f71 Merge pull request #2511 from FloFra/master
8aa6e6a Merge pull request #2650 from kemko/patch-1
ee31abf Merge pull request #2729 from grodzik/master
3b830aa Merge pull request #2693 from javiertejero/master
7949a1c Fix `docker rmi` tab completion
cee5228 Fix for Python3
9385b3e set exclude-dir or exclude grep flags only if available
fcfa323 Use cache folder inside $ZSH, delete with unaliased rm
6f3cf19 Spelling correction in itunes control function.
a9061f3 Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition
f8f0126 Merge pull request #2685 from delynn/patch-2
7d696f7 Remove mailcatcher
f46d06d Correct redirection of output from 'hash'
53323ab Added git mode support for merging, rebasing, and bisecting
5303793 history-substring-search: bindkey now checks if terminfo is available first.
c563fe9 Makes history-substring-search use term specific up and down buttons. Fixes #2089.
217d8f0 `fc -l 1` instead of `history` in zsh_stats #2501
ac6f1a0 Update to latest per-directory-history
0744acd Update to latest per-directory-history

git-subtree-dir: oh-my-zsh
git-subtree-split: eafd5f325208421b82a770e57441dd1063eb5745
Merge commit '5882d98cdb1491e07a9c3f9a02d97da38df385a5'