Fix module, round 1....

Conflicts:
	manifests/resource/instance.pp