Merge
Merge branch 'master' of github.com:CityHawk/zsh

Conflicts:
	zshrc