updated tmux and ssh agent behaviour
Merge branch 'master' of http://github.com/riffm/dotfiles

Conflicts:
	bash/bashrc