Merge pull request #43 from rgschneider/robert-feature

Robert feature
removed sorl-thumbnail headache