Misc rspec 3 fixes

I did a full audit of rspec-expectations today to try to see what, if anything else, still needed updating for RSpec 3.  I have a list of small issues I plan to open tomorrow.  For now I addressed a whole bunch of really small issues that were quicker to just address now rather than creating issues for them and coming back to them later.

Most of these are either cosmetic or are changes in the cukes.  Whoever reviews this may want to review it commit-by-commit since many of these changes are directly related but each commit is self-contained.

/cc @xaviershay @JonRowe @samphippen @soulcutter @alindeman