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.