updates .zshrc
Merge branch 'tmp'

Conflicts:
	zsh/.zshrc