for tmux check $TMUX as well as $TERM to determine if already in a tmux session
Merge branch master into guns

Conflicts:
	autoload/screen.vim