Update config settings with Christine's changes.
Merge pull request #834 from taracampbell/config_desc_christine

Update configuration descriptions, labels, etc. with Christine's changes.