Update tmux
Merge branch 'master' of github.com:americandream/dotfiles

Conflicts:
	home/.bashrc