Fixed nginx.conf.erb

Change-Id: I1bb959e4a852f3271986be1b909083d5d83f528e
Merge branch 'master' of https://github.com/mburger/puppet-nginx into mburger-master

Conflicts:
	templates/conf.d/nginx.conf.erb
Release v2.1.1