Merge branch 'master' of github.com:squizlabs/PHP_CodeSniffer

Author: gsherwood

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Contributing
 Before you contribute code to PHP\_CodeSniffer, please make sure it conforms to the PHPCS coding standard and that the PHP\_CodeSniffer unit tests still pass. The easiest way to contribute is to work on a checkout of the repository, or your own fork, rather than an installed PEAR version. If you do this, you can run the following commands to check if everything is ready to submit:
 
     cd PHP_CodeSniffer
-    php scripts/phpcs . --standard=PHPCS -np
+    php scripts/phpcs
 
 Which should give you no output, indicating that there are no coding standard errors. And then: