Fix terminal bg color for vim
Merge branch 'master' into linux