linting
Merge branch 'master' of github.com:zoide/puppet-ganglia