Remove the cruft and add the CLA
Merge remote-tracking branch 'origin/contribution-docs' into contribution-docs