Setup didn't have a module; this broke pip -r.  Add StorageFromSettings for django_storage so it can be used by the DEFAULT_STORAGE settinh which requires a class name, not instance
Merge branch 'master' into issue_1