Upgrade to rspec 3. Fixes #493