Don't overwrite file attachments with html ones

Currently, if you upload an import file that has publications containing both file attachments and HTML attachments, only the HTML attachments are imported. This fixes that.

Tracker: https://www.pivotaltracker.com/story/show/70293180