Pull PyCon API into production.

This is, functionally, a copy of #169, but into the `production` branch instead of the `develop` branch.