Puppet 3.0 support and general fixes
Merge pull request #1 from jgoldschrafe/master

Puppet 3.0 support and general fixes