Adding service and puppet.conf config
Adding hieradata and puppetmaster param
Changing server param names and template definition
Whoops, forgot to close the config!
You shouldn't restart the service with puppet!
Correcting master service named
Merge pull request #1 from jaxxstorm/master

Master