Using github as repo for vcsrepo
Merge branch 'production' of https://github.com/nicolasbrechet/mypuppet into production

Conflicts:
	Puppetfile