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

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