Upgraded to rspec 2.99

Fixing all the deprecationwarnings properly should also fix compatibility with 3.0 and fix #31