config refactor wip
merging from master
pep8 and comments
renmaing prod.py and setting more defaults
renaming to use underscores
moving the convert_tokens function to a common file
Merge pull request #6096 from edx/jarv/config-refactor-wip

Jarv/config refactor wip