Fix thin invocation for heroku
Merge branch 'heroku'