Detect and work with iTerm2's built-in tmux support.
Merge remote-tracking branch 'remotes/jameszpolley/master'

Conflicts:
	tmx