Got rid of ssh-agent in zshrc
Made some changes.
Merge branch 'master' of ssh://github.com/trozamon/dotfiles

Conflicts:
	zshrc