Several fixes for errors appearing in test output
Fixing a merge conflict
Removing a commented out test
Add Rails 4.1
Convert specs to RSpec 3.0.3 syntax with Transpec

This conversion is done by Transpec 2.3.6 with the following command:
    transpec -f

* 94 conversions
    from: obj.should
      to: expect(obj).to

* 58 conversions
    from: == expected
      to: eq(expected)

* 36 conversions
    from: obj.stub(:message)
      to: allow(obj).to receive(:message)

* 13 conversions
    from: be_false
      to: be_falsey

* 12 conversions
    from: be_true
      to: be_truthy

* 9 conversions
    from: obj.should_receive(:message)
      to: expect(obj).to receive(:message)

* 5 conversions
    from: =~ /pattern/
      to: match(/pattern/)

* 3 conversions
    from: mock('something')
      to: double('something')

* 3 conversions
    from: obj.stub(:message => value)
      to: allow(obj).to receive_messages(:message => value)

* 1 conversion
    from: lambda { }.should_not
      to: expect { }.not_to

* 1 conversion
    from: obj.should_not
      to: expect(obj).not_to

* 1 conversion
    from: obj.stub_chain(:message1, :message2)
      to: allow(obj).to receive_message_chain(:message1, :message2)

* 1 conversion
    from: stub('something')
      to: double('something')

For more details: https://github.com/yujinakayama/transpec#supported-conversions

Remove pending for passing spec

Allow Rubinius failures to account for Travis gem install issue
Fixing merge conflicts
Merge branch 'petergoldstein-feature/add_rails_4_1'

* petergoldstein-feature/add_rails_4_1:
  Convert specs to RSpec 3.0.3 syntax with Transpec
  Add Rails 4.1