Minor fixes to allow testing to proceed
Again!
Merge branch 'master' of github.com:aarontc/thermostat