Some fixes and improvements

Hi Thomas. 
Don't know if you still use this module but here are some fixes and enhancements, especially if you use Puppet 3.x :)