Update CONTRIBUTING now that we've decided on licensing
Merge branch 'split-license'