Merge branch 'hashier' into zeank
Merge branch 'zeank' of github.com:sstrigler/oh-my-zsh into zeank