Merge branch 'paper-changes' into 'master'

Changes to make automated reproducibility easier

See merge request !26