Better handling of remote tmux.
Merge branch 'master' of https://github.com/vicould/dotfiles

Conflicts:
	tmux.conf