Update readme
update gemspec and tests to remove deprecation warnings in prep for rspec 3
Merge pull request #136 from diingo/rspec3

update gemspec and tests to remove deprecation warnings in prep for rspec3
Merge branch 'upstream-master'