Update tmux.conf.
Merge branch 'master' of https://github.com/alexdavid/dotfiles

Conflicts:
	tmux/tmux.conf