Some vimrc updates
Improved git status line color logic