Minor variable rename/tweak.

Signed-off-by: crynobone <crynobone@gmail.com>
Add Orchestra\Extension\Contracts\FactoryInterface.

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

Conflicts:
	src/Extension/Factory.php