add setting for heroku toolbelt
merge latest upstream changes
merge upsteram master
Merge branch 'dev'