Update code to use guard-phpunit2

Signed-off-by: crynobone <crynobone@gmail.com>
Update to mockery 0.9.0

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' and update changelog.

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

Conflicts:
	composer.json