added mcollective client/server config
Merge branch 'master' of github.com:/markllama/origin-puppet

Conflicts:
	examples/allinone.pp