Deal with another type of Heroku error; fix a regression where token couldn't be passed as a parameter
Merge branch 'token'