Merge remote-tracking branch 'upstream/master'
Removing puma config vars

they were almost equal the default ones
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from marlonandrade/master

Removing puma config vars