Created user defined type to wrap the puppetlabs mcollective user type and set the correct callerid
Rearranged modules manifests. Put standard server configuration init.pp for convenience