Add puma settings for heroku
Merge master