Updated bit about using heroku toolbelt, because the gem is deprecated.
Merged conflict in docs/deploying/heroku