Updated oh-my-zsh

Conflicts:
	oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh
	oh-my-zsh/plugins/vagrant/_vagrant