More changes per John
Merge branch 'master' of https://github.com/sa-cdc/website