Improve this thing a bunch

PEP8 and that jazz, also support heroku's s3 addon.