Cleaned up configuration settings

Refactored config registration to allow generate_sample.sh to generate
sample configuration files correctly. Fixed a number of unrelated pep8
bugs as a result of broken pep8 check in tox due to outdated sample
configuration file.