RSpec 2.14 is a bit of a nazi about deprecations - make them disappear

[merge]