Merge HTTP and HTTPS settings for virtual hosts. Newer versions of Nginx support this.
Fix typos I introduced in the last commit.