Simplify the bucket setup to make it work better
Simplify the bucket setup to make it work better

[#151930831](https://www.pivotaltracker.com/story/show/151930831)

Signed-off-by: Zachary Gershman <3025e35db44f20e0f186af1fead3044efb259b43@pivotal.io>

barthy1/bosh,barthy1/bosh,barthy1/bosh,barthy1/bosh