changed settings/base.py and wsgi.py for AWS deployment

Merging changed base into fork