supporting puppet-nginx's vhost_cfg_append
Better name
fixing spaces
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifests/django.pp
	manifests/proxy.pp
Fixing the missed conflict
removing already removed parameter
Merge pull request #2 from netoarmando/master

supporting puppet-nginx's vhost_cfg_append