Oxford comma.
Merge branch 'master' of github.com:oddshocks/cjdcmd