Add diff hightlight
Vimrc improvements