Override default conflict text if author conflicts exist.
Re-jig conflict text in back matter.
Move contrib conflict xref outside of the aff tag.
Merge pull request #104 from gnott/conflict-text

Conflict text
Received date instead of accepted date.
Merge pull request #107 from gnott/received-date

Received date instead of accepted date.
Change default received date column to read in settings.
Set article DOI from article_id if not present in CSV file.
Merge pull request #120 from gnott/tweaks

Tweaks