Merge remote-tracking branch 'spokeo/master' into spokeo-master

Conflicts:
	levenshtein-ffi.gemspec

.gitignore

@@ -2,3 +2,5 @@ README.markdown.html
 *.rbc
 pkg
 .*.sw?
+Gemfile.lock
+*.gem

.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - rbx-18mode
+  - rbx-19mode
+before_script:
+  - cd ext/levenshtein/ && ruby extconf.rb && make && cd ../..
+script:
+  - bundle exec rspec

Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'ffi', '~> 1.1.5'
+gemspec
 
 group :test do
   gem 'rspec', '2.7.0'

README.markdown

@@ -11,7 +11,9 @@ Tested on:
 * MRI 1.8.7
 * MRI 1.9.1
 * MRI 1.9.2
-* Rubinius 1.1.0
+* MRI 1.9.3
+* MRI 2.0.0
+* Rubinius 1.1.0 (1.8 and 1.9 mode)
 
 Known Issues
 ============

levenshtein-ffi.gemspec

@@ -14,13 +14,11 @@ Gem::Specification.new do |s|
   s.email = "dbalatero@gmail.com"
   s.extensions = ["ext/levenshtein/extconf.rb"]
   s.extra_rdoc_files = [
-    "README.markdown",
-    "README.markdown.html"
+    "README.markdown"
   ]
   s.files = [
     "CHANGELOG.markdown",
     "Gemfile",
-    "Gemfile.lock",
     "README.markdown",
     "Rakefile",
     "VERSION",
@@ -43,7 +41,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, ["~> 1.1.5"])
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.8"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
@@ -52,7 +50,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ffi>, ["~> 1.1.5"])
+    s.add_dependency(%q<ffi>, ["~> 1.8"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end