add bash alias for tmux->clipboard
Merge branch 'master' into ubuntu

Conflicts:
	bashrc