Fix vim color in tmux
Merge branch 'master' into linux