Updates to support rspec and ruby 2.1.2