Rspec upgrade to 3 1

@cheald Here's the rspec upgrade to 3.1.  I rebased it off the other diff with the changelog so that I could also add changelog entries for this.