[merb-core] clean up rspec deprecations