S3 for file storage. Separate out settings and urls
Merge upstream
Must update the test settings as well
Merge pull request #51 from cmc333333/media

Settings rejigger + S3 for media storage