Smaller changes
restored error_calculation
Merge branch 'master' of https://github.com/fridde/OilSandsDatabase