puppet-lint per Puppet Approved Criteria
Reconcile class parameter documentation with puppet deployment guide
Merge pull request #344 from sdodson/puppet-lint

puppet-lint per Puppet Approved Criteria
Merge pull request #347 from sdodson/puppet-docs-sync

Reconcile class parameter documentation with puppet deployment guide
Merge remote-tracking branch 'upstream/master' into mcollective_ssl

Conflicts:
	README.asciidoc