upload to s3 diagnostics and error handling
Merge branch 'master' of github.com:antler/caribou-core