Changes necessary for s3 plugin
Merge branch 'master' into story/S3Plugin
Fix for preparing for S3 plugin
Merge pull request #224 from pencilblue/story/S3Plugin

Story/s3 plugin