edit config.json
MERGING
Updating site
Cleaning public
edited CNAME
edited CNAME
added taxonomies > config.json

adding support for taxonomies to joelwinkelman.org

goal is to display content by series in future "bibliography" section of
site
Update to research

added link to DuBois APSA paper
updating site

added two syllabi
Merge commit '9fddfd9198b6c471c357cca7405fa5c845d42a1a'
Merge branch 'master' of github.com:jmwink/joelwinkelman.org