Merge pull request #46 from DavidS/master

Updates for puppet 3.2 compatability