RSpec 3: fix + update specs (Rspec 3.x)
Merge pull request #60 from chronomantic/rspec_3

RSpec 3: fix + update specs (Rspec 3.x)