Update bashrc and zshrc
Fix ssh agent forwarding for tmux
Merge branch 'master' into lab-machines

Conflicts:
	bashrc