updated vimrc with new plugins and changed diff colors