Update code to use guard-phpunit2

Signed-off-by: crynobone <crynobone@gmail.com>
Use `&&` and `||` instead of `and` and `or`

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

Signed-off-by: crynobone <crynobone@gmail.com>
Add PHP 5.6 to travis-ci and remove .gitattributes from export

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

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

Conflicts:
	composer.json