fix oh-my-zsh submodule
merge master