Removing unused "$type" variable and long line split into two
Skip .fixed files in 1.5.x versions as well (request #288)
Merge branch 'remove-used-variable-fix' of https://github.com/aik099/PHP_CodeSniffer
Merge branch 'master' into phpcs-fixer
Fixed bug #280 : The --config-show option generates error when there is no config file
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer.php
	package.xml