Adding heroku toolbelt to path
Merging in changes