[merb-gen] clean up spec deprecations
[merb-core] clean up rspec deprecations