Rename variables again.
Merge branch 'master' into repo-split
Merge pull request #4 from Desire2Learn-Valence/nstonehouse/repo-split/list-variables

Nstonehouse/repo split/list variables