updated vimrc for diff viewing, updated plugins