Update simple_form and browser for ruby 2.2.0 compatibility

.rspec

@@ -1,2 +1,2 @@
---colour
+--color
 --profile

Gemfile

@@ -41,7 +41,7 @@ gem 'pusher'
 gem 'eventmachine', '~> 1.0.4'
 gem 'em-websocket', '~> 0.5.1'
 
-gem 'simple_form', '3.0.1'
+gem 'simple_form', '~> 3.1.0'
 gem 'slim-rails'
 gem 'sass-rails'
 gem 'coffee-rails'
@@ -54,7 +54,7 @@ gem 'font-awesome-sass'
 gem 'bourbon'
 gem 'momentjs-rails'
 gem 'eco'
-gem 'browser'
+gem 'browser', '~> 0.8.0'
 gem 'rbtree'
 gem 'liability-proof', '0.0.9'
 gem 'whenever', '~> 0.9.2'

Gemfile.lock

@@ -52,7 +52,7 @@ GEM
       eventmachine
     angularjs-rails (1.3.0)
     arel (4.0.2)
-    atomic (1.1.16)
+    atomic (1.1.99)
     awesome_print (1.2.0)
     axiom-types (0.1.0)
       descendants_tracker (~> 0.0.3)
@@ -71,7 +71,7 @@ GEM
     bourbon (3.2.3)
       sass (~> 3.2)
       thor
-    browser (0.3.2)
+    browser (0.8.0)
     builder (3.1.4)
     bunny (1.2.1)
       amq-protocol (>= 1.9.2)
@@ -369,9 +369,9 @@ GEM
     signature (0.1.7)
     simple_captcha2 (0.2.2)
       rails (>= 3.1, < 4.1)
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
+    simple_form (3.1.0)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
@@ -435,7 +435,7 @@ DEPENDENCIES
   bootstrap-sass (~> 3.2.0.2)
   bootstrap-wysihtml5-rails
   bourbon
-  browser
+  browser (~> 0.8.0)
   bunny (~> 1.2.1)
   byebug
   cancancan
@@ -500,7 +500,7 @@ DEPENDENCIES
   selenium-webdriver
   shoulda-matchers
   simple_captcha2
-  simple_form (= 3.0.1)
+  simple_form (~> 3.1.0)
   slim-rails
   timecop
   twilio-ruby (~> 3.11)

app/helpers/application_helper.rb

@@ -127,7 +127,7 @@ def history_links
 
   def simple_vertical_form_for(record, options={}, &block)
     result = simple_form_for(record, options, &block)
-    result = result.gsub(/#{SimpleForm.form_class}/, "simple_form").html_safe
+    result = result.gsub(/#{SimpleForm.default_form_class}/, "simple_form").html_safe
     result.gsub(/col-xs-\d/, "").html_safe
   end
 

config/initializers/simple_form.rb

@@ -116,7 +116,7 @@
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
   # You can define the class to use on all forms. Default is simple_form.
-  config.form_class = 'simple_form'
+  config.default_form_class = 'simple_form'
 
   # You can define which elements should obtain additional classes
   # config.generate_additional_classes_for = [:wrapper, :label, :input]