Activate terminal titles
Removed OS X specific tmux command
Merge branch 'master' into Darwin