Merge pull request #537 from depquid/1.6

Backported ability to set Paperclip styles to 1.6