Change to puma for heroku
Merge branch 'heroku'