Fix Ruby 2.0 compatibility issue
Merge pull request #28 from DanOlson/ruby-2.0-compat

Fix Ruby 2.0 compatibility issue
Merge branch 'master' into rspec-deprecations