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