[MRG+1] simple grammatical/formatting changes (minor)

[herinckc]

No description provided.

[whalebot-helmsman]

@herinckc Problem with unit-tests was fixed in master. Can you merge master to this PR?

[codecov]

Codecov Report

Merging #3260 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3260   +/-   ##
=======================================
  Coverage   82.12%   82.12%           
=======================================
  Files         228      228           
  Lines        9599     9599           
  Branches     1385     1385           
=======================================
  Hits         7883     7883           
  Misses       1457     1457           
  Partials      259      259

[herinckc]

@whalebot-helmsman I believe I've successfully merged this pull request with master. Also removed a previous change that was causing the build to fail. Let me know if I need to change anything

[kmike]

Hey @herinckc! We haven't written these texts ourselves; license is BSD 3-clause, and Code of Conduct is from https://www.contributor-covenant.org/version/1/4/code-of-conduct. I'd prefer to keep them as-is; if you think there is an error in text, it is better to fix that in canonical texts. I'm not sure where to report issues with BSD license text (probably it is fixed forever); Code of Conduct spelling issues can be reported and fixed here: https://github.com/ContributorCovenant/contributor_covenant

[cathalgarvey]

I'd agree these are changes to upstream to the source of the policy. However, unless we actively track the policy as it evolves and changes (and, I don't think we do?), I see no harm in merging these changes as-is, too.

[kmike]

Ok, fair enough. +1 to merge after squashing then.

[dangra]

It's hard to accept a change to a widely spread public document like BSD-3 but considering the change is really correct IMO it must be fixed here and upstream.

[dangra]

I was reluctant to accept this change until I looked for more info and found this 😂 :

source: http://themoosebody.tumblr.com/post/10317138331/unlikelywords-why-the-oxford-comma-is