Shortest path to staging & testing

Not the solution we really want for hosting data on S3 but it'll do for now.
That's what it should be doing.  The dangers of cherry picking from a git stash.