changed highlight order in vimrc, changed diff colors