Merge master and re-run update_lints.py

diff --cc README.md
index 290684d3bad145284a8121298fe117eb2025a4af,63ecbf11fcf9743debaaa3549f92bf0879bd169d..04b0bd0e384a4939da1c2809f96d80f2ae849bed
--- 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 99 lints included in this crate:
++There are 100 lints included in this crate:
  
  name                                                                                                           | default | meaning
  ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --cc src/lib.rs
Simple merge