Use an oxford comma
Merge pull request #1098 from alex/oxford-comma

Use an oxford comma