Additional cleanup timeloop
Merge branch 'master' of https://github.com/microhh/microhh into masterupstream