Modified RSpec files to work with rspec 3.1

Also added my solution to the problems, I'm not sure if those should have been included or not. I also noticed there were 3 other problem sets (bottles, orange_tree, screen_scrape). I completed 'bottles' and adjusted the rspec file, but didn't do the others. Let me know what you think!

- Coy