1021099 - Rename puppet.conf -> pulp_puppet.conf
Update documentation for puppet.conf -> pulp_puppet.conf rename
Fix for comments from PR
Merge pull request #81 from pulp/barnabycourt-1021099

1021099  - Rename puppet.conf -> pulp_puppet.conf
Automatic commit of package [pulp-puppet] release [2.3.0-0.25.beta].
Fix spec break
Merge pull request #82 from pulp/barnabycourt-1021099

Fix spec break
Automatic commit of package [pulp-puppet] release [2.3.0-0.26.beta].
1024739 - Rename /etc/pulp/vhosts80/pulp_puppet.conf to puppet.conf.
Merge pull request #83 from pulp/rbarlow-1024739

1024739 - Rename /etc/pulp/vhosts80/pulp_puppet.conf to puppet.conf.
Automatic commit of package [pulp-puppet] release [2.2.1-0.1.beta].
Merge branch 'pulp-2.2', post build.
Automatic commit of package [pulp-puppet] release [2.3.0-0.27.beta].
Automatic commit of package [pulp-puppet] release [2.3.0-0.28.beta].
Automatic commit of package [pulp-puppet] release [2.3.0-0.29.beta].
Merge branch 'master' into pulp-2.4

Conflicts:
	run-tests.py