Minor vim and tmux fixes