vim/vimrc: change cinoptions

Previously, cinoptions attempted to use 1 shiftwidth for line
continuations except for if/while/switch and related lines, where two
sw's were used.  However, looking at code in the various libraries, it
appears that more commonly the line continuation is 2 sw's in all cases.