Allow secure_path and env_reset options to be changed
Merge branch 'more_settings'

Conflicts:
	manifests/params.pp