First attempt at handling multiple nginx versions
Attempt at handling multiple nginx versions.
Merge remote-tracking branch 'origin/add_nginx_version' into
add_nginx_version

Conflicts:
	manifests/init.pp
	manifests/params.pp
Remove duplicate pkg_version setting that got in there.
fix typo.
Expose more proxy configuration.
Merge branch 'add_proxy_parameters' into new_parameters_merge

Conflicts:
	manifests/init.pp
Merge branch 'add_nginx_version' into new_parameters_merge

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