specify exact jfryman-nginx puppet module version to install
replace ngircd with charybdis
Merge branch 'replace-ngircd-with-charybdis' of https://github.com/tildeclub/puppet-tilde into replace-ngircd-with-charybdis

Conflicts:
	README.md