detect tmux, skip if not usable
Merge branch 'master' of 140.113.88.190:repo/dotfiles

Conflicts:
	bashrc