Merged oh-my-zsh with latest master