Upgrade to RSpec 3
Merge pull request #173 from wvanbergen/rspec_ugrade

Upgrade to RSpec 3