Swap dependencies to allow better usage outside of laravel app.

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

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

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

Conflicts:
	composer.json
Merge branch '2.2'

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

Conflicts:
	composer.json