converted to puma by default
enabled ssl by default for puma
Merge branch 'develop' into testing