Config file PR cleanups.
Merge pull request #992 from rjackson/cleanup-config-changes

Config file PR cleanups.