Force tmux into 256 color mode
Merge

set tmux default to xterm not tmux

Conflicts:
	tmux/tmux.conf