Switch to my puppet-sahara implementation for the time being.
Merge pull request #185 from frozencemetery/sahara-new-master

Switch to my puppet-sahara implementation for the time being.