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

The upstream puppet-sahara is currently broken and insufficiently powerful for our purposes.  Work has begun on migrating upstream to my implementation as seen [here](https://groups.google.com/a/puppetlabs.com/forum/?_escaped_fragment_=topic/puppet-openstack/0BETdNvrd70#!topic/puppet-openstack/0BETdNvrd70), but it is difficult to tell how long this will take.