added disable_tests parameter
Merge branch 'feature_disable_tests'

Conflicts:
	manifests/init.pp
	manifests/params.pp