Add references to new global config variables.
Merge branch 'master' of github.com:f00f/training