Alignment changes to heroku-toolbelt
Merge pull request #4475 from vitorgalvao/heroku-toolbelt-changes

Alignment changes to heroku-toolbelt