Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge remote-tracking branch 'plalloni/master'