More work on temperature aggregate with testing.
Merge branch 'master' of github.com:killrweather/killrweather
Minor test cleanup.