updated zsh and install
Merge branch 'master' of https://github.com/thorerik/dotFiles

Conflicts:
	zshrc