Fix for uploading file with additional params

When uploading a file with PUT or POST additional parameters are not
merged into the resource body by default, so they are not included in the
resulting multipart mime request. This is the right behaviour when
uploading an object body, but not for a file.
Merge pull request #24 from jonnii/upload-file-bug

Fix for uploading file with additional params