Add cinoptions to Vim modelines

The cinoptions option helps Vim auto-indent code more correctly, if not
perfectly.
Fix indentation