Fiddlin with production.rb to compile assets correctly on heroku
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Adds amazon s3 for paperclip uploads to heroku
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Merge branch 'aws-gemming'