Added heroku toolbelt
Merged changes