Merge pull request #22 from DavidS/master

Updates for puppet 3.2 compatability