Refactor storage definition and tests
Merge branch 'master' of github.com:ui/django-thumbnails