Merge branch 'master' of github.com:cszang/treeclim

Conflicts:
	README.org
Merge branch 'master' of github.com:cszang/treeclim

Conflicts:
	README.org