Merge pull request #10 from DavidS/master

Updates for puppet 3.2 compatability