WIP: more conf.py changes