Fixed to work on latest puppet 3.x, scoped variable calls.  Cleaned out older 6.0.18 support.