resolved merging conflict
removed merging artifacts
corrected a merge error
removed reference do DB_v1
removed useless steps
added requested changes
Merge pull request #384 from Galithil/History

 History handling
Merge branch 'master' of https://github.com/SciLifeLab/scilifelab into caliper_qc_flags
cleaned up redundant error handling