Merge pull request #1553 from stevewithington/develop

allow for AWS S3 credentials to be defined in settings.ini.cfm