Oxford comma.
Merge pull request #42 from oddshocks/master

Oxford comma.