Commented custom modules section
Merge branch 'testing' into production

Conflicts:
	Puppetfile