Use Heroku-recommended timeout numbers

Rename ENV variables to be very explicit.
Couples their names to their libraries.
Merge remote-tracking branch 'upstream/master'