Merge pull request #34 from DougEdey/master

Merge from master
Merge pull request #35 from DougEdey/master

Merge from master
A number of fixes - heater/cooling now work from GUI.  Fix to get cooling device enabled if delay is set
merged
A number of fixes - heater/cooling now work from GUI.  Fix to get cooling device enabled if delay is set
Merge branch 'DougEdey-master'
Merge remote-tracking branch 'origin/master'
Merge pull request #35 from cmpterman2/master

Fix for heat not working, fixes for cooling and compressor based devices