Manifest changes

* puppet::master now calls puppet::agent instead of inheriting from it
* adds puppet_server attribute to puppet::master call
* adds default values for user id and group id
* renamed srvname to server_name in apache template