Switching to our own puppet-nova dependency

This allows us to cherrypick some features from HEAD

Conflicts:

	Puppetfile