Fix some RSpec 3 deprecations
Upgrade to RSpec 3
Merge pull request #104 from wvanbergen/rspec3

RSpec 3