color tweaks for tmux conf
Merge branch 'master' of https://github.com/mpobrien/dotfiles

Conflicts:
	.tmux.conf