Merge pull request #68 from CactusPuppy/pull-upstream

Pull upstream changes into fork

Gemfile.lock

@@ -65,8 +65,8 @@ GEM
       awesome_nested_set (>= 3.0)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     ajax-datatables-rails (0.4.3)
       railties (>= 4.0)
@@ -96,13 +96,13 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (2.3.0)
-    capybara (3.26.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     carrierwave (2.1.1)
       activemodel (>= 5.0.0)
@@ -423,7 +423,7 @@ GEM
     pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.6)
     puma (5.2.2)
       nio4r (~> 2.0)
     racc (1.5.2)
@@ -492,7 +492,7 @@ GEM
     recaptcha (4.14.0)
       json
     redcarpet (3.5.1)
-    regexp_parser (1.6.0)
+    regexp_parser (2.1.1)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.1)