File header updates for consistency
Merge remote-tracking branch 'origin/master' into 2.0
First wave removal of sketchy ideas