fix variable references in parseConfig conditionals, closes #531
Merge branch 'master' into gh-pages
rebuild