Upgrade RSpec to latest version and fix all warnings

Upgrade RSpec to the latest version, fix a deprecation warning and pull in #70 and #79 to remove warnings