Update rspec, use new expect syntax for mocks.
Clean up tests to be in line with nre RSpec stuff.
Merge pull request #38 from contextio/bh/update_rspec

Upgrade RSpec