Added pgrep
Merge branch 'master' of https://github.com/bzf/dotfiles

Conflicts:
	.zshrc
Added Stupid-EasyMotion and relative numbers