Updated rspec to 2.14 and fixed some deprecations