Removed the cs fixers from the test suite
Merge remote-tracking branch 'origin/2.1'

Conflicts:
	.travis.yml
	CHANGELOG.md
Removed .php_cs