phpunit fix
Merge branch 'master' of https://github.com/Vinceveve/oh-my-zsh

Conflicts:
	plugins/phpunit/phpunit.plugin.zsh