Add pear and check if zsh highlighting file exists
Add alias gc=git diff
Merge branch 'master' of github.com:anoxic/dotfiles

Conflicts:
	zshrc