merge in heroku stuff

`foreman` builds locally, but still not sure this will work for staging deployment