Merge branch 'devonhollowood-for-loop-over-option'

Conflicts:
	README.md

diff --cc README.md
index 212d868c698881d75fc5bbf4c7feba4610aec680,39b848d036bc59890ced044c9fe52ec2d99cb1e5..ec1dd7f6dbb3a7f93cf665565d71912e79197b59
--- 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 102 lints included in this crate:
 -There are 103 lints included in this crate:
++There are 104 lints included in this crate:
  
  name                                                                                                           | default | meaning
  ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --cc src/lib.rs
Simple merge