bugfix
Merge branch 'master' of github.com:torian/puppet-nsswitch

Conflicts:
	manifests/params.pp