Use installed phpunit.

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

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

Signed-off-by: crynobone <crynobone@gmail.com>
Remove php 5.6 from allowed failure.

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

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

Conflicts:
	.travis.yml