Make tmux use the current shell
Merge branch 'master' into uw