diff --git a/VERSION b/VERSION
index 4637f7ff..a4a8bef4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0.beta2
+2.2.0.beta5
diff --git a/couchrest_model.gemspec b/couchrest_model.gemspec
index cc5960f9..e8bf507b 100644
--- a/couchrest_model.gemspec
+++ b/couchrest_model.gemspec
@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("couchrest",   "2.0.1")
-  s.add_dependency("activemodel", ">= 4.0.2")
-  s.add_dependency("tzinfo",      ">= 0.3.22")
-  s.add_dependency("hashdiff",    "~> 0.3")
+  s.add_runtime_dependency("couchrest",   "2.0.1")
+  s.add_runtime_dependency("activemodel", ">= 4.0.2")
+  s.add_runtime_dependency("tzinfo",      ">= 0.3.22")
+  s.add_runtime_dependency("hashdiff",    ">= 1.0.0")
   s.add_development_dependency("rspec", "~> 3.5.0")
   s.add_development_dependency("rack-test", ">= 0.5.7")
   s.add_development_dependency("rake", ">= 0.8.0", "< 11.0")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("minitest", "> 4.1") #, "< 5.0") # For Kaminari and activesupport, pending removal
-  s.add_development_dependency("kaminari", ">= 0.14.1", "< 0.16.0")
+  s.add_development_dependency("kaminari", ">= 1.1")
   s.add_development_dependency("mime-types", "< 3.0") # Mime-types > 3.0 don't bundle properly on JRuby
 end
diff --git a/lib/couchrest/model/connection_config.rb b/lib/couchrest/model/connection_config.rb
index f1b20d92..b64fd79b 100644
--- a/lib/couchrest/model/connection_config.rb
+++ b/lib/couchrest/model/connection_config.rb
@@ -19,8 +19,8 @@ def [](file)
       private
 
       def load_config(file)
-        if File.exists?(file)
-          YAML::load(ERB.new(IO.read(file)).result).symbolize_keys
+        if File.exist?(file)
+          YAML::load(ERB.new(IO.read(file)).result, aliases: true).symbolize_keys rescue YAML::load(ERB.new(IO.read(file)).result).symbolize_keys
         else
           { }
         end
diff --git a/lib/couchrest/model/designs/view.rb b/lib/couchrest/model/designs/view.rb
index 67e78893..ceeb0fe1 100644
--- a/lib/couchrest/model/designs/view.rb
+++ b/lib/couchrest/model/designs/view.rb
@@ -141,6 +141,8 @@ def count
             limit(0).total_rows
           end
         end
+        
+        alias :size :count
 
         # Check to see if the array of documents is empty. This *will*
         # perform the query and return all documents ready to use, if you don't
diff --git a/lib/couchrest/model/dirty.rb b/lib/couchrest/model/dirty.rb
index 642f2892..48b5391a 100644
--- a/lib/couchrest/model/dirty.rb
+++ b/lib/couchrest/model/dirty.rb
@@ -22,7 +22,7 @@ def changes
         if original_change_data.nil?
           nil
         else
-          HashDiff.diff(original_change_data, current_change_data)
+          Hashdiff.diff(original_change_data, current_change_data)
         end
       end