my changes to puma and nginx configs to merge in
merged master with puma-config-jjb
Merge branch 'puma-config-jjb'