Move zshrc env settings
Add reload in pryrc
Update
Merge branch 'master' of github.com:ifyouseewendy/dotfiles

Conflicts:
	pryrc
	zshrc