Extract infer file type code into own file.
Enable rspec/rails to be loaded via rspec/rails/without_filetype_infer to allow opt-out of that behaviour.
Merge pull request #969 from rspec/issue-662-2

Internal refactoring to enable opt-out of infer filetype behaviour
Switches back to mainline rails/rails repository
Merge branch 'rails_4_1'
Switches back to mainline ammeter

<https://github.com/alexrothenberg/ammeter/pull/25> is merged
Doc: "infers controller action" heading

Copypasta nitpick.
Merge pull request #974 from olleolleolle/master

Doc: "infers controller action" heading
Fix specs

RSpec.configuration= is no longer defined.
Ensure the original configuration is restored in with_isolated_config
Merge pull request #975 from rosenfeld/fix-specs

Fix specs
Make Gemfile default the rails version more intelligently.
Merge pull request #977 from rspec/fix-gemfile

Make Gemfile default the rails version more intelligently.
use ammeter 1.0.0 gem as it is now compatible with rspec 3 & 2
Merge pull request #986 from alexrothenberg/use-ammeter-1.0

use ammeter 1.0.0 gem as it is now compatible with rspec 3 & 2
Switch inferring file type by location to opt-in rather than always on.