Updating .gitignore
Updating .gitignore
Merging updates to the zf2 branch back into master
Update composer.json
Fixing the skeleton for puppet 3.7
Merge branch 'master' into zf2

Conflicts:
	composer.json
	puppet/modules/app/manifests/webserver.pp