Merge branch 'master' into regex_syntax

diff --cc README.md
index eb843daab208af3e3f72a6c77fa98a7aac533046,d6daa49c52138e4a3ac64cec0ea171be06040309..f7908ffdcab7739861ea96f46b30046c50bfc11e
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -6,7 -6,7 +6,7 @@@ A collection of lints to catch common m
  [Jump to usage instructions](#usage)
  
  ##Lints
--There are 110 lints included in this crate:
++There are 111 lints included in this crate:
  
  name                                                                                                           | default | meaning
  ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --cc src/lib.rs
Simple merge