Merge branch 'release/0.4.1'
Merge branch 'release/0.4.2'
add back in s3_access_key and s3_secret_key to be backwards compatible
Merge branch 'hotfix/0.4.3' into develop