Some renames and puppet style cleanup
Merge branch 'master' of github.com:scottsuch/puppetized-grafana-example