upgrade rspec and mocha
try to split tests that use mocks from those that do not for travis build. mocking makes the tests that depend on previously mocked objects hang, even after they have been unmocked