Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-stunnel

Conflicts:
	Modulefile
	manifests/tun.pp