Updating composer vendor namespace
Merge branch 'master' of git://github.com/encorephp/config

Conflicts:
	composer.json