Add missing imports in conf.py

Also, remove a couple of lines added accidentally.