Update to param text
Merge branch 'master' into rspec

Conflicts:
	manifests/init.pp
update params
Merge pull request #1 from jimfdavies/rspec

Update to param text