Unify Nginx files to match as closely as possible

Created by: bbodenmiller

Also includes minor formatting changes.

SSL Nginx file on left, normal on right