Further work on unit tests,
possible issues with integral
calls
Merge branch 'master' of https://github.com/eml11/geotherm
forgot to git pull