Tested and prepared combined pull requests

As this project is going to be merged back into django-storages and there are a bunch of patches pending, I am joining a bunch of them to help @richleland out. These are tested, reviewed and backward-compatible.