Add tmux, add git cherry-pick and merge, remove old stuff