Rework index-related config vars

I also did some cosmetic pep8 test cleanup.

Fixes #25