Merge branch 'master' of github.com:dlebauer/climate-utils

Conflicts:
	README.md
Merge branch 'master' of github.com:dlebauer/climate-utils