sync
Merge branch 'master' of https://github.com/Conte-Ecology/conteStreamTemperature

merging kyle's updates with mine