BDE style: added alignment of function arguments
Disabled CUA mode by default (but keep rectangular regions)
Insertion of redundant #include guards for a region
Merge remote-tracking branch 'upstream/master'