Update startup command
Update tmux config
Merge branch 'master' into osx