Make pep8 less angry

Cosmetics, etc.

Had also forgotten to add WAIT_TIME_AFTER_FOLLOW to sample_config.py