Fix typo in mongoid.yml configuration template
Merge pull request #3836 from Zorbash/patch-1

Fix typo in mongoid.yml configuration template
Added underscore prefix for unused local parameteres as per the ruby style guide https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#underscore-unused-vars
Rephrase comment in lib/mongoid/railtie.rb
remove Railtie.generator

This method is no longer needed, he detects the generator method wich has changed from Rails 2.x to 3.0.0. Mongoid has a dependency to activemodel > 4.0, which related in a dependency to Rails > 4.0. Which means that this check is no longer needed, there can't be a Rails < 4.0
Merge pull request #3867 from timoschilling/patch-3

remove Railtie.generator
Merge pull request #3857 from Zorbash/master

Rephrase comment in lib/mongoid/railtie.rb
Merge pull request #3841 from lethalbrains/master

Added underscore prefix for unused local parameters as per the ruby sty...