heroku almost working
Merge pull request #20 from meidlin/matt

S3 Almost working