Install oh-my-zsh correctly
Merge branch 'master' into php53