better gzip support
Merge branch 'master' of github.com:javierwilson/puppetlabs-nginx

Conflicts:
	templates/conf.d/nginx.conf.erb