Update README.markdown
Update README.markdown
small fix for makeFriendlyName() when the name finish with a cap it raised an exception
Verbose option no longer errors when using a phar file with a space in the path
Merge branch 'phpcs-fixer' of https://github.com/squizlabs/PHP_CodeSniffer into phpcs-fixer
Fixed bug #20355 : No sniffs are registered with PHAR on Windows
Merge branch 'master' of https://github.com/squizlabs/PHP_CodeSniffer
Merge branch 'master' of https://github.com/jmarcil/PHP_CodeSniffer
Updated changelog
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Reports/Source.php
	README.markdown
	package.xml
Merge branch 'phpcs-fixer' of https://github.com/martinssipenko/PHP_CodeSniffer into phpcs-fixer
Maintain backwards compatability + changelog
Prepare for 1.5.4 release
Merge branch 'master' into phpcs-fixer

Conflicts:
	package.xml
Improved closure support in Generic ScopeIndentSniff
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer.php
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
	package.xml
Changed from error to warning because API functions need it
Improved indented PHP tag support in Generic ScopeIndentSniff
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
Allowed sigle undersored methods and functions

for CamelCapsFunctionName sniff