Merge branch 'master' of github.com:ryanhertz/spark_api into idx-link-finders

Author: ryanhertz

.bundle/config

@@ -1,3 +1,9 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.1.6
+
+# Try to work around a travisCI quirk
+# see https://git.io/vVf62 for more
+before_install:
+  - gem install bundler

.rbenv-version renamed to .ruby-version

@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'webmock', '~> 1.9'
   s.add_development_dependency 'typhoeus', '~> 0.3'
   s.add_development_dependency 'ci_reporter', '~> 1.7.0'
-  s.add_development_dependency 'rcov', '~> 0.9.9'
   s.add_development_dependency 'rb-readline'
   s.add_development_dependency 'rb-fsevent'
   s.add_development_dependency 'simplecov'