Update puppet dependencies
Merge branch 'update-puppetfile'

Conflicts:
	CHANGES.md
Merge branch 'master' into activesync
Move zpush to its own namespace