Add flexibility over key generation in S3Upload

 - Fix prefixStage so that it actually works
 - Add prefixPackage
 - Write some tests to test the options