add puma configuration
move sidekiq to `_sidekiq`
Merge branch 'master' into heroku