Upgrade to RSpec 3

Merge #28 first!