Update composer.json
Merge pull request #52 from GrahamCampbell/patch-2

Update composer.json
Revert mockery, if anything this should be managed manually.

Signed-off-by: crynobone <crynobone@gmail.com>
Update fixtures configuration.

Signed-off-by: crynobone <crynobone@gmail.com>
Include default resources.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.2'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	composer.json