Attempt to make it easier to run on heroku

Might need tweaking; speculative and untested.