v1 scheduler
Merge branch 'develop' of github.com:PyCon/pycon into develop