fix tox tests and backwards compatibility with python2.7
Merge branch 'master' of https://github.com/OnroerendErfgoed/atramhasis