Update heroku-toolbelt to 3.12.1

And put the ordering back like how it was.