Alignment changes to heroku-toolbelt