Simplify tmux, add nvi