Compatibility with breaking change in paperclip master
Merge pull request #5 from johnnyshields/master

Compatibility with breaking change in paperclip master