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

Conflict text
Merge branch 'master' of github.com:elifesciences/elife-poa-xml-generation into ejp-to-hw-zip-workflow