a couple more changes to variables before moving on to facts and conditions
mostly complete for conditions and facts quest
Merge pull request #141 from kjhenner/conditions

Conditions