rm'd trailing underscore from state variables
resolved merge confilicts
fixed include error in tests
Merge pull request #864 from scopatz/svar

rm'd trailing underscore from state variables