Upgrades and simple_form dependency removal

spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'rspec/matchers'
 require 'capybara/rspec'
 require 'turnip/capybara'
 require 'in_memory_q_counter'
+require 'capybara-screenshot/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -18,7 +19,9 @@ Dir.glob("spec/acceptance_steps/**/*steps.rb") { |f| load f, true }
 I18n.locale =I18n.default_locale
 Devise.stretches = 1
 Capybara.javascript_driver = :webkit
-Capybara.default_wait_time = 6 # ember needs more time than the default of 2
+Capybara.default_wait_time = 4 # ember needs more time than the default of 2
+Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }
+
 #Capybara.javascript_driver = :selenium
 
 module FactoryAttributesFor