Moved to Rspec 3.0.0, corrected dictonaries, added simplecov