typo fixing
solving conflicts
minor fixes to make the pipeline run
typo in last conflict merge---> fixed
Merge pull request #97 from vezzi/devel

More bug fixing and --retry_failed option for piper runs