new gemfile for paperclip 3.5
Merge branch 'master' of github.com:jrgifford/delayed_paperclip

merging upstream