Updated .zshrc and setup.sh
Merge branch 'master' of https://github.com/sammy8806/zsh_config

Conflicts:
	.zshrc