Merge pull request #512 from code-dot-org/staging

DTT
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test
Use the AWS command-line app to 'sync' logs to S3.
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging