Updating puppet versions
Merge branch 'librarian'

Conflicts:
	Puppetfile