Heroku

Consolidated branch of paperclip, s3, and heroku changes. Reflects what is deployed to calm-meadow-5876.herokuapp.com. Removed .git copy.