Adding some rules from the code sniffer library.

Adding some rules from the code sniffer library and removing one of the
custom sniffs because there was a generic one to replace it.