Added changes for RSpec, mocks, Ruby 1.9.3+, deprecated gems