make module puppet 3 ready

Hi,

I've made some changes to get this module work with puppet 3 too.
One commit is a bug which you should definitely change as far as I can tell.
Perhaps you want also do the other changes too. But unfortunatly one commit change a option which could be a problem if someone update this module and didn't see it.

Cheers,
Kim