Fix build and update to RSpec 3.x

1. Fixed a spec issue introduced by recent renaming
2. Bumped up RSpec version to 3.x
3. Updated Redis termination for 3.x
4. Addressed a number of deprecation warnings.

Build runs green.