Ensure files are merged with data prior to validation

Wrote test to validate that when upload files are present, the metadata
is merged with the incoming parameter data prior to validation.
Merge branch 'hotfix/file-uploads'

Close #14