upgrading to RSpec 3
Merge pull request #242 from georgemillo/rspec-3

upgrading to RSpec 3