Figure out how to pass Heroku client between threads

[nellshamrell]

See this comment on a previous pull request for details.