add additional parameters, style-guide changes

Conflicts:
	manifests/init.pp