Issue #170: Converting remaining general variables to config, state, or settings.
Merge pull request #532 from quicksketch/170/more_variables

Issue #170: Converting remaining general variables to config, state, or settings.