added privoxy check
Merge branch 'master' of github.com:mkrull/oh-my-zsh

Conflicts:
	zshrc