removed sorl-thumbnail headache
resolved merge conflicts
Merge pull request #48 from rgschneider/robert-feature

removed sorl-thumbnail headache