Made Chris's suggested changes for AWS.
Change to AWS running parameters
Merge branch 'feature/get_database_connected' into develop