Shortest path to staging & testing

Not the solution we really want for hosting data on S3 but it'll do for now.
Agree, keeping this logic in as few places as possible seems like a good idea.