update s3 settings
add placeholder image so asset pipeline cant complain
image url instead of image object
use default image so asset pipeline cant complain
fix uncommented too much
Merge pull request #1 from epoch/master

fix weird encoding stuff, now works in heroku