Merge pull request #47 from ScotterC/refactoring-specs

Refactoring/Ading specs
Merge pull request #48 from ScotterC/paperclip-3-5

Paperclip 3.5
Merge branch 'master' of github.com:jrgifford/delayed_paperclip

merging upstream