Remove uses

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

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

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

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

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

Conflicts:
	.travis.yml
	src/Support/Messages.php
	src/Support/Validator.php
Merge branch '2.2'