RSpec 3.1 support & Fix a couple Rails 4.1.6 regressions.