Activate ssh-agent forwarding
Merge branch 'master' of github.com:renajohn/dot-files

Conflicts:
	zshrc