Issue #170: Converting more variables to settings and config.
Merge pull request #531 from quicksketch/170/more_variables

Issue #170: Converting more variables to settings and config.