Avoid using $datastream->content...

...  Not sure if the alternative is really much better, creating
the file-object and saving it manually (so it gets deleted when it
expires in 6 hours or so, in the case we error out generating
derivatives).
Merge pull request #35 from adam-vessey/7.x

Avoid using $datastream->content...
Merge branch '7.x'