Remove grep options
Merge branch 'master' of github.com:joshaw/zsh

Conflicts:
	environment.zsh