Updating to the new RSpec syntax.
Preparing for 2.1.5 release.