diff --git a/.rspec b/.rspec
index 4e1e0d2f7..83e16f804 100644
--- a/.rspec
+++ b/.rspec
@@ -1 +1,2 @@
 --color
+--require spec_helper
diff --git a/Gemfile b/Gemfile
index 36da0c2c0..16ce997e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,92 +1,52 @@
 source 'https://rubygems.org'
 
-ruby "2.1.5"
+ruby '2.1.5'
+
+gem 'rails', '4.1.7'
 
 gem 'bundler', '>=1.1.5'
 
-gem 'rails', '3.2.13'
-gem 'rack', '~>1.4.5'
-gem 'json', '~>1.7.7'
+gem 'sass-rails',   '~> 4.0.4'
+gem 'coffee-rails', '~> 4.1.0'
 gem 'haml'
+
+# Another CSS preprocessor, used for Bootstrap overrides
+gem 'less', '~>2.5.0'
+gem 'less-rails', '~> 2.5.0'
+# CSS framework
+gem 'less-rails-bootstrap', '~> 3.2.0'
+
+gem 'uglifier', '~> 2.5.3'         # JavaScript compressor
+
+gem 'jquery-rails'
+gem 'jquery-ui-rails', '~> 5.0.2'
+gem 'js-routes'  # provides access to Rails routes in Javascript
+gem 'flickraw'
+
 gem 'leaflet-rails'
 gem 'leaflet-markercluster-rails'
-gem 'unicorn' # http server
-
+gem 'unicorn'                      # http server
 gem 'pg'
-
-gem 'figaro' # for handling config via ENV variables
-
-gem 'cancan' # for checking member privileges
-
-gem 'gibbon' # for Mailchimp newsletter subscriptions
-
-gem 'csv_shaper' # CSV export
+gem 'figaro'                       # for handling config via ENV variables
+gem 'cancancan', '~> 1.9'          # for checking member privileges
+gem 'gibbon'                       # for Mailchimp newsletter subscriptions
+gem 'csv_shaper'                   # CSV export
 
 # vendored activemerchant for testing- needed for bogus paypal
 # gateway monkeypatch
 gem 'activemerchant', '1.33.0',
-  :path => 'vendor/gems/activemerchant-1.33.0',
+  :path    => 'vendor/gems/activemerchant-1.33.0',
   :require => 'active_merchant'
 gem 'active_utils', '1.0.5',
-  :path => 'vendor/gems/active_utils-1.0.5'
+  :path    => 'vendor/gems/active_utils-1.0.5'
 
-group :production, :staging do
-  gem 'newrelic_rpm'
-  gem 'dalli'
-  gem 'memcachier'
-  gem 'rails_12factor' # supresses heroku plugin injection
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  # CSS preprocessor, used for app/assets/stylesheets/application.css
-  gem 'sass-rails',   '~> 3.2.3'
-  # CoffeeScript is a Python-like language that compiles to JavaScript
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # less-rails depends on a JavaScript engine; we use therubyracer.
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # long term, we'll probably want node.js for performance, but this will do
-  # for now as it's easier for new people to install
-  gem "therubyracer", "~> 0.12", :platforms => :ruby
-  # libv8 is needed by therubyracer and is a bit finicky
-  gem 'libv8', '3.16.14.7'
-
-  # Another CSS preprocessor, used for Bootstrap overrides
-  gem "less", '~>2.5.0'
-  gem "less-rails", '~> 2.5.0'
-  # CSS framework
-  gem "less-rails-bootstrap", '~> 3.2.0'
-
-  gem 'uglifier', '>= 1.0.3' # JavaScript compressor
-
-  gem 'compass-rails', '~> 1.0.3' # Yet Another CSS framework
-end
-
-gem 'jquery-rails'
-gem 'jquery-ui-rails'
-gem 'js-routes'  # provides access to Rails routes in Javascript
-gem 'flickraw'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-group :development do
-  # A debugger and irb alternative. Pry doesn't play nice
-  # with unicorn, so start a Webrick server when debugging
-  # with Pry
-  gem 'pry'
-  gem 'better_errors'
-  gem 'binding_of_caller'
-  gem 'letter_opener'
-end
+# less-rails depends on a JavaScript engine; we use therubyracer.
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# long term, we'll probably want node.js for performance, but this will do
+# for now as it's easier for new people to install
+gem 'therubyracer', '~> 0.12', :platforms => :ruby
+# libv8 is needed by therubyracer and is a bit finicky
+gem 'libv8', '3.16.14.7'
 
 # Markdown formatting for updates etc
 gem 'bluecloth'
@@ -95,10 +55,10 @@ gem 'bluecloth'
 gem 'will_paginate', '~> 3.0'
 
 # user signup/login/etc
-gem 'devise', '~> 3.2.0'
+gem 'devise', '~> 3.4.1'
 
 # nicely formatted URLs
-gem 'friendly_id', '~> 4.0.10'
+gem 'friendly_id', '~> 5.0.4'
 
 # gravatars
 gem 'gravatar-ultimate'
@@ -118,16 +78,34 @@ gem 'omniauth-flickr', '>= 0.0.15'
 
 gem 'rake', '>= 10.0.0'
 
-group :development, :test do
-  gem 'byebug'                       # debugging
-  gem 'haml-rails'                   # HTML templating language
-  gem 'rspec-rails', '~> 2.12.1'     # unit testing framework
-  gem 'database_cleaner', '~> 1.3.0'
-  gem 'webrat'                       # provides HTML matchers for view tests
-  gem 'factory_girl_rails', '~> 4.0' # for creating test data
-  gem 'coveralls', require: false    # coverage analysis
-  gem 'capybara'                     # integration tests
-  gem 'capybara-email'               # integration tests for email
-  gem 'poltergeist', '~> 1.5.1'      # for headless JS testing
-  gem 'i18n-tasks'                   # adds tests for finding missing and unused translations
+group :production, :staging do
+  gem 'newrelic_rpm'
+  gem 'dalli'
+  gem 'memcachier'
+  gem 'rails_12factor' # supresses heroku plugin injection
+end
+
+group :development do
+  # A debugger and irb alternative. Pry doesn't play nice
+  # with unicorn, so start a Webrick server when debugging
+  # with Pry
+  gem 'pry'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'letter_opener'
+end
+
+group :development, :test do
+  gem 'haml-rails'                      # HTML templating language
+  gem 'rspec-rails', '~> 3.1.0'         # unit testing framework
+  gem 'rspec-activemodel-mocks'
+  gem 'byebug'                          # debugging
+  gem 'database_cleaner', '~> 1.3.0'
+  gem 'webrat'                          # provides HTML matchers for view tests
+  gem 'factory_girl_rails', '~> 4.5.0'  # for creating test data
+  gem 'coveralls', require: false       # coverage analysis
+  gem 'capybara'                        # integration tests
+  gem 'capybara-email'                  # integration tests for email
+  gem 'poltergeist', '~> 1.5.1'         # for headless JS testing
+  gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a053b509..7cc298019 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,35 +20,34 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.7)
+      actionview (= 4.1.7)
+      activesupport (= 4.1.7)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.7)
+      activesupport (= 4.1.7)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
+      builder (~> 3.1)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
+      arel (~> 5.0.0)
+    activesupport (4.1.7)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    arel (3.0.3)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.9)
     better_errors (2.0.0)
       coderay (>= 1.0.0)
@@ -59,12 +58,12 @@ GEM
     bluecloth (2.2.0)
     bootstrap-datepicker-rails (1.3.0.2)
       railties (>= 3.0)
-    builder (3.0.4)
+    builder (3.2.2)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
-    cancan (1.6.10)
+    cancancan (1.9.2)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -74,24 +73,17 @@ GEM
     capybara-email (2.4.0)
       capybara (~> 2.4)
       mail
-    chunky_png (1.3.3)
     cliver (0.3.2)
     coderay (1.1.0)
-    coffee-rails (3.2.2)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     commonjs (0.2.7)
-    compass (0.12.7)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -104,13 +96,14 @@ GEM
     database_cleaner (1.3.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
-    devise (3.2.4)
+    devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     easy_translate (0.5.0)
       json
@@ -126,29 +119,35 @@ GEM
     figaro (1.0.0)
       thor (~> 0.14)
     flickraw (0.9.8)
-    friendly_id (4.0.10.1)
-      activerecord (>= 3.0, < 4.0)
-    fssm (0.2.10)
+    friendly_id (5.0.4)
+      activerecord (>= 4.0.0)
     gibbon (1.1.4)
       httparty
       multi_json (>= 1.3.4)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (4.0.5)
+    haml (4.1.0.beta.1)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
+    haml-rails (0.6.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
     hashie (3.3.2)
     highline (1.6.21)
     hike (1.2.3)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
+    httparty (0.13.3)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.1)
+    i18n (0.6.11)
     i18n-tasks (0.7.8)
       activesupport
       easy_translate (>= 0.5.0)
@@ -158,16 +157,15 @@ GEM
       slop (>= 3.5.0)
       term-ansicolor
       terminal-table
-    journey (1.0.4)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.2)
-      railties (>= 3.1.0)
+    jquery-ui-rails (5.0.3)
+      railties (>= 3.2.16)
     js-routes (0.9.9)
       railties (>= 3.2)
       sprockets-rails
-    json (1.7.7)
+    json (1.8.1)
     kgio (2.9.2)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -181,20 +179,20 @@ GEM
       less (~> 2.5.0)
     less-rails-bootstrap (3.2.0)
       less-rails (~> 2.5.0)
-    letter_opener (1.2.0)
+    letter_opener (1.3.0)
       launchy (~> 2.2)
     libv8 (3.16.14.7)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     memcachier (0.0.2)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mini_portile (0.6.1)
+    minitest (5.5.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    netrc (0.8.0)
-    newrelic_rpm (3.9.7.266)
+    netrc (0.10.0)
+    newrelic_rpm (3.9.8.273)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     oauth (0.4.7)
@@ -216,75 +214,85 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
+    rails (4.1.7)
+      actionmailer (= 4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      activemodel (= 4.1.7)
+      activerecord (= 4.1.7)
+      activesupport (= 4.1.7)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.7)
+      sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    railties (4.1.7)
+      actionpack (= 4.1.7)
+      activesupport (= 4.1.7)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rake (10.4.2)
     ref (1.0.5)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    rspec-activemodel-mocks (1.0.1)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      rspec-mocks (>= 2.99, < 4.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
     sass (3.2.19)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
+    sass-rails (4.0.5)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    sexp_processor (4.4.4)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    sprockets (2.2.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (0.0.1)
-      sprockets (>= 1.0.2)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
@@ -296,13 +304,11 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     tins (1.3.3)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    uglifier (2.2.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -313,7 +319,9 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.0)
     will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -330,20 +338,19 @@ DEPENDENCIES
   bootstrap-datepicker-rails
   bundler (>= 1.1.5)
   byebug
-  cancan
+  cancancan (~> 1.9)
   capybara
   capybara-email
-  coffee-rails (~> 3.2.1)
-  compass-rails (~> 1.0.3)
+  coffee-rails (~> 4.1.0)
   coveralls
   csv_shaper
   dalli
   database_cleaner (~> 1.3.0)
-  devise (~> 3.2.0)
-  factory_girl_rails (~> 4.0)
+  devise (~> 3.4.1)
+  factory_girl_rails (~> 4.5.0)
   figaro
   flickraw
-  friendly_id (~> 4.0.10)
+  friendly_id (~> 5.0.4)
   geocoder!
   gibbon
   gravatar-ultimate
@@ -351,9 +358,8 @@ DEPENDENCIES
   haml-rails
   i18n-tasks
   jquery-rails
-  jquery-ui-rails
+  jquery-ui-rails (~> 5.0.2)
   js-routes
-  json (~> 1.7.7)
   leaflet-markercluster-rails
   leaflet-rails
   less (~> 2.5.0)
@@ -369,14 +375,14 @@ DEPENDENCIES
   pg
   poltergeist (~> 1.5.1)
   pry
-  rack (~> 1.4.5)
-  rails (= 3.2.13)
+  rails (= 4.1.7)
   rails_12factor
   rake (>= 10.0.0)
-  rspec-rails (~> 2.12.1)
-  sass-rails (~> 3.2.3)
+  rspec-activemodel-mocks
+  rspec-rails (~> 3.1.0)
+  sass-rails (~> 4.0.4)
   therubyracer (~> 0.12)
-  uglifier (>= 1.0.3)
+  uglifier (~> 2.5.3)
   unicorn
   webrat
   will_paginate (~> 3.0)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index beb65d620..6f1d08c72 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -15,7 +15,7 @@
 //= require js-routes
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.autocomplete
+//= require jquery-ui/autocomplete
 //= require twitter/bootstrap
 //= require_tree .
 //= require bootstrap-datepicker
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 98c343be5..c9c1a79d1 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -3,7 +3,7 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require jquery.ui.autocomplete
+ *= require jquery-ui/autocomplete
  *= require bootstrap-datepicker
  *= require leaflet
  *= require leaflet.markercluster
diff --git a/app/assets/stylesheets/overrides.css.less b/app/assets/stylesheets/overrides.css.less
index e08579efb..13b0a1cf4 100644
--- a/app/assets/stylesheets/overrides.css.less
+++ b/app/assets/stylesheets/overrides.css.less
@@ -1,3 +1,5 @@
+
+
 @import "twitter/bootstrap/bootstrap";
 @import "custom_bootstrap/variables";
 // this padding needs to be done before the responsive stuff is imported
diff --git a/app/controllers/account_types_controller.rb b/app/controllers/account_types_controller.rb
index ce448ceba..4c3da9080 100644
--- a/app/controllers/account_types_controller.rb
+++ b/app/controllers/account_types_controller.rb
@@ -36,7 +36,7 @@ class AccountTypesController < ApplicationController
 
   # POST /account_types
   def create
-    @account_type = AccountType.new(params[:account_type])
+    @account_type = AccountType.new(account_type_params)
 
     respond_to do |format|
       if @account_type.save
@@ -52,7 +52,7 @@ class AccountTypesController < ApplicationController
     @account_type = AccountType.find(params[:id])
 
     respond_to do |format|
-      if @account_type.update_attributes(params[:account_type])
+      if @account_type.update(account_type_params)
         format.html { redirect_to @account_type, notice: 'Account type was successfully updated.' }
       else
         format.html { render action: "edit" }
@@ -69,4 +69,10 @@ class AccountTypesController < ApplicationController
       format.html { redirect_to account_types_url, notice: 'Account type was successfully deleted.' }
     end
   end
+
+  private 
+
+  def account_type_params
+    params.require(:account_type).permit(:is_paid, :is_permanent_paid, :name)
+  end
 end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index c163e0ffc..cdfcc2d00 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -30,7 +30,7 @@ class AccountsController < ApplicationController
     @account = Account.find(params[:id])
 
     respond_to do |format|
-      if @account.update_attributes(params[:account])
+      if @account.update(params[:account])
         format.html { redirect_to @account, notice: 'Account detail was successfully updated.' }
       else
         format.html { render action: "edit" }
@@ -38,4 +38,10 @@ class AccountsController < ApplicationController
     end
   end
 
+  private
+
+  def account_params
+    params.require(:account).permit(:account_type_id, :member_id, :paid_until)
+  end
+
 end
diff --git a/app/controllers/alternate_names_controller.rb b/app/controllers/alternate_names_controller.rb
index 21cb294a0..f75f8e442 100644
--- a/app/controllers/alternate_names_controller.rb
+++ b/app/controllers/alternate_names_controller.rb
@@ -45,7 +45,7 @@ class AlternateNamesController < ApplicationController
   # POST /alternate_names.json
   def create
     params[:alternate_name][:creator_id] = current_member.id
-    @alternate_name = AlternateName.new(params[:alternate_name])
+    @alternate_name = AlternateName.new(alternate_name_params)
 
     respond_to do |format|
       if @alternate_name.save
@@ -64,7 +64,7 @@ class AlternateNamesController < ApplicationController
     @alternate_name = AlternateName.find(params[:id])
 
     respond_to do |format|
-      if @alternate_name.update_attributes(params[:alternate_name])
+      if @alternate_name.update(alternate_name_params)
         format.html { redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.' }
         format.json { head :no_content }
       else
@@ -88,4 +88,10 @@ class AlternateNamesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def alternate_name_params
+    params.require(:alternate_name).permit(:crop_id, :name, :creator_id)
+  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e417984fa..9dd23395c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -43,4 +43,36 @@ class ApplicationController < ActionController::Base
     I18n.available_locales.map(&:to_s).include?(parsed_locale) ? parsed_locale : nil
   end
 
+  before_action :configure_permitted_parameters, if: :devise_controller?
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.for(:sign_up) do |member| 
+      member.permit(:login_name, :email, :password, :password_confirmation,
+        :remember_me, :login,
+        # terms of service
+        :tos_agreement,
+        # profile stuff
+        :bio, :location, :latitude, :longitude,
+        # email settings
+        :show_email, :newsletter, :send_notification_email, :send_planting_reminder
+      )
+    end
+
+    devise_parameter_sanitizer.for(:account_update) do |member|
+      member.permit(:login_name, :email, :password, :password_confirmation,
+        :remember_me, :login,
+        # terms of service
+        :tos_agreement,
+        # profile stuff
+        :bio, :location, :latitude, :longitude,
+        # email settings
+        :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
+        #update password
+        :current_password
+      )
+    end
+  end
+
 end
diff --git a/app/controllers/authentications_controller.rb b/app/controllers/authentications_controller.rb
index 898310a3b..ee82bd9e8 100644
--- a/app/controllers/authentications_controller.rb
+++ b/app/controllers/authentications_controller.rb
@@ -27,12 +27,17 @@ class AuthenticationsController < ApplicationController
         name = auth['info']['name']
       end
 
-      @authentication = current_member.authentications.find_or_create_by_provider_and_uid(
-        :provider => auth['provider'],
-        :uid => auth['uid'],
+      @authentication = current_member.authentications
+      .create_with(
         :name => name,
         :token => auth['credentials']['token'],
-        :secret => auth['credentials']['secret'])
+        :secret => auth['credentials']['secret']
+      )
+      .find_or_create_by(
+        :provider => auth['provider'],
+        :uid => auth['uid'],
+        :name => name)
+
       flash[:notice] = "Authentication successful."
     else
       flash[:notice] = "Authentication failed."
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a24b4fed3..e62feedfc 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -2,8 +2,6 @@ class CommentsController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
 
-  cache_sweeper :comment_sweeper
-
   # GET /comments
   # GET /comments.json
   def index
@@ -55,7 +53,7 @@ class CommentsController < ApplicationController
   # POST /comments.json
   def create
     params[:comment][:author_id] = current_member.id
-    @comment = Comment.new(params[:comment])
+    @comment = Comment.new(comment_params)
 
     respond_to do |format|
       if @comment.save
@@ -79,7 +77,7 @@ class CommentsController < ApplicationController
     params[:comment].delete("author_id")
 
     respond_to do |format|
-      if @comment.update_attributes(params[:comment])
+      if @comment.update(comment_params)
         format.html { redirect_to @comment.post, notice: 'Comment was successfully updated.' }
         format.json { head :no_content }
       else
@@ -101,4 +99,10 @@ class CommentsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private 
+
+  def comment_params
+    params.require(:comment).permit(:author_id, :body, :post_id)
+  end
 end
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index be4eccc2e..48f8342f0 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -3,8 +3,6 @@ class CropsController < ApplicationController
   load_and_authorize_resource
   skip_authorize_resource :only => [:hierarchy, :search]
 
-  cache_sweeper :crop_sweeper
-
   # GET /crops
   # GET /crops.json
   def index
@@ -56,7 +54,7 @@ class CropsController < ApplicationController
 
     @partial_matches = Crop.search(params[:search])
     # exclude exact match from partial match list
-    @partial_matches.reject!{ |r| @exact_match && r.eql?(@exact_match) }
+    @partial_matches = @partial_matches.reject{ |r| @exact_match && r.eql?(@exact_match) }
 
     @fuzzy = Crop.search(params[:term])
 
@@ -104,7 +102,7 @@ class CropsController < ApplicationController
   # POST /crops.json
   def create
     params[:crop][:creator_id] = current_member.id
-    @crop = Crop.new(params[:crop])
+    @crop = Crop.new(crop_params)
 
     respond_to do |format|
       if @crop.save
@@ -123,7 +121,7 @@ class CropsController < ApplicationController
     @crop = Crop.find(params[:id])
 
     respond_to do |format|
-      if @crop.update_attributes(params[:crop])
+      if @crop.update(crop_params)
         format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
         format.json { head :no_content }
       else
@@ -144,4 +142,10 @@ class CropsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def crop_params
+    params.require(:crop).permit(:en_wikipedia_url, :name, :parent_id, :creator_id, :scientific_names_attributes)
+  end
 end
diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index d6e38c81f..0bf949ac8 100644
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -2,7 +2,8 @@ class FollowsController < ApplicationController
 
   # POST /follows
   def create
-    @follow = current_member.follows.build(:followed_id => params[:followed_id])
+    
+    @follow = current_member.follows.build(:followed_id => follow_params[:followed_id])
 
     if @follow.save
       flash[:notice] = "Followed #{ @follow.followed.login_name }"
@@ -15,11 +16,17 @@ class FollowsController < ApplicationController
 
   # DELETE /follows/1
   def destroy
-    @follow = current_member.follows.find(params[:id])
+    @follow = current_member.follows.find(follow_params[:id])
     unfollowed_name = @follow.followed.login_name
     @follow.destroy
 
     flash[:notice] = "Unfollowed #{ unfollowed_name }"
     redirect_to root_path
   end
+
+  private
+
+  def follow_params
+    params.permit(:id, :followed_id, :follower_id, :authenticity_token, :_method)
+  end
 end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index b77939111..132924edc 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -1,8 +1,6 @@
 class ForumsController < ApplicationController
   load_and_authorize_resource
 
-  cache_sweeper :forum_sweeper
-
   # GET /forums
   # GET /forums.json
   def index
@@ -44,7 +42,7 @@ class ForumsController < ApplicationController
   # POST /forums
   # POST /forums.json
   def create
-    @forum = Forum.new(params[:forum])
+    @forum = Forum.new(forum_params)
 
     respond_to do |format|
       if @forum.save
@@ -63,7 +61,7 @@ class ForumsController < ApplicationController
     @forum = Forum.find(params[:id])
 
     respond_to do |format|
-      if @forum.update_attributes(params[:forum])
+      if @forum.update(forum_params)
         format.html { redirect_to @forum, notice: 'Forum was successfully updated.' }
         format.json { head :no_content }
       else
@@ -84,4 +82,10 @@ class ForumsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def forum_params
+    params.require(:forum).permit(:description, :name, :owner_id, :slug)
+  end
 end
diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index dd3d56542..f2ce6103a 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -1,8 +1,7 @@
 class GardensController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
-  
-  cache_sweeper :garden_sweeper
+
 
   # GET /gardens
   # GET /gardens.json
@@ -50,12 +49,13 @@ class GardensController < ApplicationController
   # POST /gardens.json
   def create
     params[:garden][:owner_id] = current_member.id
-    @garden = Garden.new(params[:garden])
+    @garden = Garden.new(garden_params)
 
     respond_to do |format|
       if @garden.save
         format.html { redirect_to @garden, notice: 'Garden was successfully created.' }
         format.json { render json: @garden, status: :created, location: @garden }
+        expire_fragment("homepage_stats")
       else
         format.html { render action: "new" }
         format.json { render json: @garden.errors, status: :unprocessable_entity }
@@ -69,7 +69,7 @@ class GardensController < ApplicationController
     @garden = Garden.find(params[:id])
 
     respond_to do |format|
-      if @garden.update_attributes(params[:garden])
+      if @garden.update(garden_params)
         format.html { redirect_to @garden, notice: 'Garden was successfully updated.' }
         format.json { head :no_content }
       else
@@ -84,10 +84,18 @@ class GardensController < ApplicationController
   def destroy
     @garden = Garden.find(params[:id])
     @garden.destroy
+    expire_fragment("homepage_stats")
 
     respond_to do |format|
       format.html { redirect_to gardens_by_owner_path(:owner => @garden.owner), notice: 'Garden was successfully deleted.' }
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def garden_params
+    params.require(:garden).permit(:name, :slug, :owner_id, :description, :active,
+    :location, :latitude, :longitude, :area, :area_unit)
+  end
 end
diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb
index a51ee574e..3bc151d8c 100644
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -62,7 +62,7 @@ class HarvestsController < ApplicationController
   def create
     params[:harvest][:owner_id] = current_member.id
     params[:harvested_at] = parse_date(params[:harvested_at])
-    @harvest = Harvest.new(params[:harvest])
+    @harvest = Harvest.new(harvest_params)
 
     respond_to do |format|
       if @harvest.save
@@ -81,7 +81,7 @@ class HarvestsController < ApplicationController
     @harvest = Harvest.find(params[:id])
 
     respond_to do |format|
-      if @harvest.update_attributes(params[:harvest])
+      if @harvest.update(harvest_params)
         format.html { redirect_to @harvest, notice: 'Harvest was successfully updated.' }
         format.json { head :no_content }
       else
@@ -102,4 +102,11 @@ class HarvestsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def harvest_params
+    params.require(:harvest).permit(:crop_id, :harvested_at, :description, :owner_id,
+    :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug)
+  end
 end
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index ac53f4194..8ca1c4c24 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -1,10 +1,10 @@
 class MembersController < ApplicationController
   load_and_authorize_resource
 
-  cache_sweeper :member_sweeper
-
   skip_authorize_resource :only => :nearby
 
+  after_action :expire_cache_fragments, :only => :create
+
   def index
     @members = Member.confirmed.paginate(:page => params[:page])
 
@@ -44,4 +44,10 @@ class MembersController < ApplicationController
     @followers = @member.followers.paginate(:page => params[:page])
   end
 
+  private
+
+  def expire_cache_fragments
+    expire_fragment("homepage_stats")
+  end
+
 end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index a5905d088..3d3a217ad 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -5,7 +5,7 @@ class NotificationsController < ApplicationController
 
   # GET /notifications
   def index
-    @notifications = Notification.find_all_by_recipient_id(current_member)
+    @notifications = Notification.where(recipient_id: current_member)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -49,7 +49,7 @@ class NotificationsController < ApplicationController
   # POST /notifications
   def create
     params[:notification][:sender_id] = current_member.id
-    @notification = Notification.new(params[:notification])
+    @notification = Notification.new(notification_params)
     @recipient = Member.find_by_id(params[:notification][:recipient_id])
 
     respond_to do |format|
@@ -60,4 +60,10 @@ class NotificationsController < ApplicationController
       end
     end
   end
+
+  private
+
+  def notification_params
+    params.require(:notification).permit(:sender_id, :recipient_id, :subject, :body, :post_id, :read)
+  end
 end
diff --git a/app/controllers/order_items_controller.rb b/app/controllers/order_items_controller.rb
index d9c072b28..37a7e7b74 100644
--- a/app/controllers/order_items_controller.rb
+++ b/app/controllers/order_items_controller.rb
@@ -7,7 +7,7 @@ class OrderItemsController < ApplicationController
     if params[:order_item][:price]
       params[:order_item][:price] = params[:order_item][:price].to_f * 100 # convert to cents
     end
-    @order_item = OrderItem.new(params[:order_item])
+    @order_item = OrderItem.new(order_item_params)
     @order_item.order = current_member.current_order || Order.create(:member_id => current_member.id)
 
     respond_to do |format|
@@ -20,4 +20,10 @@ class OrderItemsController < ApplicationController
       end
     end
   end
+
+  private
+
+  def order_item_params
+    params.require(:order_item).permit(:order_id, :price, :product_id, :quantity)
+  end
 end
diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index 7ee0b5a56..3cc4caa9c 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -4,7 +4,7 @@ class OrdersController < ApplicationController
 
   # GET /orders
   def index
-    @orders = Order.find_all_by_member_id(current_member.id)
+    @orders = Order.where(member_id: current_member.id)
 
     respond_to do |format|
       format.html # index.html.erb
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index c745f403d..3fac4ea32 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,8 +1,6 @@
 class PhotosController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
-  
-  cache_sweeper :photo_sweeper
 
   # GET /photos
   # GET /photos.json
@@ -61,7 +59,7 @@ class PhotosController < ApplicationController
   # POST /photos.json
   def create
     @photo = Photo.find_by_flickr_photo_id(params[:photo][:flickr_photo_id]) ||
-      Photo.new(params[:photo])
+      Photo.new(photo_params)
     @photo.owner_id = current_member.id
     @photo.set_flickr_metadata
 
@@ -111,7 +109,7 @@ class PhotosController < ApplicationController
     @photo = Photo.find(params[:id])
 
     respond_to do |format|
-      if @photo.update_attributes(params[:photo])
+      if @photo.update(photo_params)
         format.html { redirect_to @photo, notice: 'Photo was successfully updated.' }
         format.json { head :no_content }
       else
@@ -132,4 +130,11 @@ class PhotosController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def photo_params
+    params.require(:photo).permit(:flickr_photo_id, :owner_id, :title, :license_name,
+    :license_url, :thumbnail_url, :fullsize_url, :link_url)
+  end
 end
diff --git a/app/controllers/plant_parts_controller.rb b/app/controllers/plant_parts_controller.rb
index f27f0ead3..ed67926c7 100644
--- a/app/controllers/plant_parts_controller.rb
+++ b/app/controllers/plant_parts_controller.rb
@@ -42,7 +42,7 @@ class PlantPartsController < ApplicationController
   # POST /plant_parts
   # POST /plant_parts.json
   def create
-    @plant_part = PlantPart.new(params[:plant_part])
+    @plant_part = PlantPart.new(plant_part_params)
 
     respond_to do |format|
       if @plant_part.save
@@ -61,7 +61,7 @@ class PlantPartsController < ApplicationController
     @plant_part = PlantPart.find(params[:id])
 
     respond_to do |format|
-      if @plant_part.update_attributes(params[:plant_part])
+      if @plant_part.update(plant_part_params)
         format.html { redirect_to @plant_part, notice: 'Plant part was successfully updated.' }
         format.json { head :no_content }
       else
@@ -82,4 +82,10 @@ class PlantPartsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def plant_part_params
+    params.require(:plant_part).permit(:name, :slug)
+  end
 end
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index c9086307e..9fdefc388 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -1,9 +1,6 @@
 class PlantingsController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
-  
-
-  cache_sweeper :planting_sweeper
 
   # GET /plantings
   # GET /plantings.json
@@ -33,7 +30,7 @@ class PlantingsController < ApplicationController
   # GET /plantings/1
   # GET /plantings/1.json
   def show
-    @planting = Planting.includes(:owner, :crop, :garden, :photos).find(params[:id])
+    @planting = Planting.includes(:owner, :crop, :garden, :photos).friendly.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -68,14 +65,15 @@ class PlantingsController < ApplicationController
   # POST /plantings
   # POST /plantings.json
   def create
-    params[:planting][:owner_id] = current_member.id
     params[:planted_at] = parse_date(params[:planted_at])
-    @planting = Planting.new(params[:planting])
+    @planting = Planting.new(planting_params)
+    @planting.owner = current_member
 
     respond_to do |format|
       if @planting.save
         format.html { redirect_to @planting, notice: 'Planting was successfully created.' }
         format.json { render json: @planting, status: :created, location: @planting }
+        expire_fragment("homepage_stats")
       else
         format.html { render action: "new" }
         format.json { render json: @planting.errors, status: :unprocessable_entity }
@@ -90,7 +88,7 @@ class PlantingsController < ApplicationController
     params[:planted_at] = parse_date(params[:planted_at])
 
     respond_to do |format|
-      if @planting.update_attributes(params[:planting])
+      if @planting.update(planting_params)
         format.html { redirect_to @planting, notice: 'Planting was successfully updated.' }
         format.json { head :no_content }
       else
@@ -106,10 +104,19 @@ class PlantingsController < ApplicationController
     @planting = Planting.find(params[:id])
     @garden = @planting.garden
     @planting.destroy
+    expire_fragment("homepage_stats")
 
     respond_to do |format|
       format.html { redirect_to @garden }
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def planting_params
+    params.require(:planting).permit(:crop_id, :description, :garden_id, :planted_at,
+    :quantity, :sunniness, :planted_from, :owner_id, :finished,
+    :finished_at)
+  end
 end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index d36a809ae..ceb4730cc 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -2,8 +2,6 @@ class PostsController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
 
-  cache_sweeper :post_sweeper
-
   # GET /posts
   # GET /posts.json
 
@@ -58,7 +56,7 @@ class PostsController < ApplicationController
   # POST /posts.json
   def create
     params[:post][:author_id] = current_member.id
-    @post = Post.new(params[:post])
+    @post = Post.new(post_params)
 
     respond_to do |format|
       if @post.save
@@ -77,7 +75,7 @@ class PostsController < ApplicationController
     @post = Post.find(params[:id])
 
     respond_to do |format|
-      if @post.update_attributes(params[:post])
+      if @post.update(post_params)
         format.html { redirect_to @post, notice: 'Post was successfully updated.' }
         format.json { head :no_content }
       else
@@ -98,4 +96,10 @@ class PostsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def post_params
+    params.require(:post).permit(:body, :subject, :author_id, :forum_id)
+  end
 end
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
index 41754199b..1ed69703f 100644
--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -36,7 +36,7 @@ class ProductsController < ApplicationController
 
   # POST /products
   def create
-    @product = Product.new(params[:product])
+    @product = Product.new(product_params)
 
     respond_to do |format|
       if @product.save
@@ -52,7 +52,7 @@ class ProductsController < ApplicationController
     @product = Product.find(params[:id])
 
     respond_to do |format|
-      if @product.update_attributes(params[:product])
+      if @product.update(product_params)
         format.html { redirect_to @product, notice: 'Product was successfully updated.' }
       else
         format.html { render action: "edit" }
@@ -69,4 +69,11 @@ class ProductsController < ApplicationController
       format.html { redirect_to products_url }
     end
   end
+
+  private
+
+  def product_params
+    params.require(:product).permit(:description, :min_price, :recommended_price, :name,
+    :account_type_id, :paid_months)
+  end
 end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 50eccef0c..c4883bd4d 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,7 +1,5 @@
 class RegistrationsController < Devise::RegistrationsController
 
-  cache_sweeper :member_sweeper
-
   def edit
     @twitter_auth = current_member.auth('twitter')
     @flickr_auth  = current_member.auth('flickr')
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 8aecf5c2a..c932d75ae 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -36,7 +36,7 @@ class RolesController < ApplicationController
 
   # POST /roles
   def create
-    @role = Role.new(params[:role])
+    @role = Role.new(role_params)
 
     respond_to do |format|
       if @role.save
@@ -52,7 +52,7 @@ class RolesController < ApplicationController
     @role = Role.find(params[:id])
 
     respond_to do |format|
-      if @role.update_attributes(params[:role])
+      if @role.update(role_params)
         format.html { redirect_to @role, notice: 'Role was successfully updated.' }
       else
         format.html { render action: "edit" }
@@ -69,4 +69,10 @@ class RolesController < ApplicationController
       format.html { redirect_to roles_url }
     end
   end
+
+  private
+
+  def role_params
+    params.require(:role).permit(:description, :name, :members, :slug)
+  end
 end
diff --git a/app/controllers/scientific_names_controller.rb b/app/controllers/scientific_names_controller.rb
index 1a727f715..511a96279 100644
--- a/app/controllers/scientific_names_controller.rb
+++ b/app/controllers/scientific_names_controller.rb
@@ -2,8 +2,6 @@ class ScientificNamesController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
 
-  cache_sweeper :scientific_name_sweeper
-
   # GET /scientific_names
   # GET /scientific_names.json
   def index
@@ -47,7 +45,7 @@ class ScientificNamesController < ApplicationController
   # POST /scientific_names.json
   def create
     params[:scientific_name][:creator_id] = current_member.id
-    @scientific_name = ScientificName.new(params[:scientific_name])
+    @scientific_name = ScientificName.new(scientific_name_params)
 
     respond_to do |format|
       if @scientific_name.save
@@ -66,7 +64,7 @@ class ScientificNamesController < ApplicationController
     @scientific_name = ScientificName.find(params[:id])
 
     respond_to do |format|
-      if @scientific_name.update_attributes(params[:scientific_name])
+      if @scientific_name.update(scientific_name_params)
         format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully updated.' }
         format.json { head :no_content }
       else
@@ -90,4 +88,10 @@ class ScientificNamesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def scientific_name_params
+    params.require(:scientific_name).permit(:crop_id, :scientific_name, :creator_id)
+  end
 end
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index d1205dab7..ac5dfb0c3 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -2,8 +2,6 @@ class SeedsController < ApplicationController
   before_filter :authenticate_member!, :except => [:index, :show]
   load_and_authorize_resource
 
-  cache_sweeper :seed_sweeper
-
   # GET /seeds
   # GET /seeds.json
   def index
@@ -68,7 +66,7 @@ class SeedsController < ApplicationController
   # POST /seeds.json
   def create
     params[:seed][:owner_id] = current_member.id
-    @seed = Seed.new(params[:seed])
+    @seed = Seed.new(seed_params)
 
     respond_to do |format|
       if @seed.save
@@ -87,7 +85,7 @@ class SeedsController < ApplicationController
     @seed = Seed.find(params[:id])
 
     respond_to do |format|
-      if @seed.update_attributes(params[:seed])
+      if @seed.update(seed_params)
         format.html { redirect_to @seed, notice: 'Seed was successfully updated.' }
         format.json { head :no_content }
       else
@@ -108,4 +106,11 @@ class SeedsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  def seed_params
+    params.require(:seed).permit(:owner_id, :crop_id, :description, :quantity, :plant_before,
+    :tradable_to, :slug)
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ff8132be8..1764768e4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -24,5 +24,11 @@ module ApplicationHelper
       :target => "_blank"
   end 
 
+  def cache_key_for(klass)
+    count          = klass.count
+    max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_s, :number)
+    "#{klass.name.downcase.pluralize}/all-#{count}-#{max_updated_at}"
+  end
+
 end
 
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index c1c7768b3..0d6aa6db3 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -13,8 +13,8 @@ class Notifier < ActionMailer::Base
   def planting_reminder(member)
     @member = member
 
-    @plantings = @member.plantings.reorder.last(5)
-    @harvests = @member.harvests.reorder.last(5)
+    @plantings = @member.plantings.first(5)
+    @harvests = @member.harvests.first(5)
 
     if @member.send_planting_reminder
       mail(:to => @member.email,
diff --git a/app/models/account.rb b/app/models/account.rb
index c0348e611..547fc57bf 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,5 +1,4 @@
 class Account < ActiveRecord::Base
-  attr_accessible :account_type_id, :member_id, :paid_until
   belongs_to :member
   belongs_to :account_type
 
@@ -9,7 +8,7 @@ class Account < ActiveRecord::Base
 
   before_create do |account|
     unless account.account_type
-      account.account_type = AccountType.find_or_create_by_name(
+      account.account_type = AccountType.find_or_create_by(name: 
         Growstuff::Application.config.default_account_type
       )
     end
diff --git a/app/models/account_type.rb b/app/models/account_type.rb
index dc464707b..d6be51a94 100644
--- a/app/models/account_type.rb
+++ b/app/models/account_type.rb
@@ -1,5 +1,4 @@
 class AccountType < ActiveRecord::Base
-  attr_accessible :is_paid, :is_permanent_paid, :name
   has_many :products
 
   def to_s
diff --git a/app/models/alternate_name.rb b/app/models/alternate_name.rb
index fb92a2bc9..408740680 100644
--- a/app/models/alternate_name.rb
+++ b/app/models/alternate_name.rb
@@ -1,5 +1,4 @@
 class AlternateName < ActiveRecord::Base
-  attr_accessible :crop_id, :name, :creator_id
   belongs_to :crop
   belongs_to :creator, :class_name => 'Member'
 end
diff --git a/app/models/authentication.rb b/app/models/authentication.rb
index 325bffe40..e6171c8b7 100644
--- a/app/models/authentication.rb
+++ b/app/models/authentication.rb
@@ -1,4 +1,3 @@
 class Authentication < ActiveRecord::Base
   belongs_to :member
-  attr_accessible :provider, :uid, :token, :secret, :name
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index f797848e0..f7da18842 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,10 +1,9 @@
 class Comment < ActiveRecord::Base
-  attr_accessible :author_id, :body, :post_id
   belongs_to :author, :class_name => 'Member'
   belongs_to :post
 
-  default_scope order("created_at DESC")
-  scope :post_order, reorder("created_at ASC") # for display on post page
+  default_scope { order("created_at DESC") }
+  scope :post_order, -> { reorder("created_at ASC") } # for display on post page
 
   after_create do
     recipient = self.post.author.id
diff --git a/app/models/comment_sweeper.rb b/app/models/comment_sweeper.rb
deleted file mode 100644
index fed7b6f4c..000000000
--- a/app/models/comment_sweeper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CommentSweeper < ActionController::Caching::Sweeper
-  observe Comment
-
-  def after_create(comment)
-    expire_fragment('recent_posts')
-  end
-
-  def after_update(comment)
-  end
-
-  def after_destroy(comment)
-    expire_fragment('recent_posts')
-  end
-
-end
diff --git a/app/models/crop.rb b/app/models/crop.rb
index b63f9a8a5..0a7d8d442 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -1,7 +1,6 @@
 class Crop < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, use: :slugged
-  attr_accessible :en_wikipedia_url, :name, :parent_id, :creator_id, :scientific_names_attributes
+  friendly_id :name, use: [:slugged, :finders]
 
   has_many :scientific_names
   accepts_nested_attributes_for :scientific_names,
@@ -13,7 +12,7 @@ class Crop < ActiveRecord::Base
   has_many :photos, :through => :plantings
   has_many :seeds
   has_many :harvests
-  has_many :plant_parts, :through => :harvests, :uniq => :true
+  has_many :plant_parts, -> { uniq }, :through => :harvests
   belongs_to :creator, :class_name => 'Member'
 
   belongs_to :parent, :class_name => 'Crop'
@@ -21,16 +20,15 @@ class Crop < ActiveRecord::Base
   has_and_belongs_to_many :posts
   before_destroy {|crop| crop.posts.clear}
 
-
-  default_scope order("lower(name) asc")
-  scope :recent, reorder("created_at desc")
-  scope :toplevel, where(:parent_id => nil)
-  scope :popular, reorder("plantings_count desc, lower(name) asc")
-  scope :randomized, reorder('random()') # ok on sqlite and psql, but not on mysql
+  default_scope { order("lower(name) asc") }
+  scope :recent, -> { reorder("created_at desc") }
+  scope :toplevel, -> { where(:parent_id => nil) }
+  scope :popular, -> { reorder("plantings_count desc, lower(name) asc") }
+  scope :randomized, -> { reorder('random()') } # ok on sqlite and psql, but not on mysql
 
   validates :en_wikipedia_url,
     :format => {
-      :with => /^https?:\/\/en\.wikipedia\.org\/wiki/,
+      :with => /\Ahttps?:\/\/en\.wikipedia\.org\/wiki/,
       :message => 'is not a valid English Wikipedia URL'
     }
 
@@ -132,7 +130,7 @@ class Crop < ActiveRecord::Base
     cropbot = Member.find_by_login_name('cropbot')
     raise "cropbot account not found: run rake db:seed" unless cropbot
 
-    crop = Crop.find_or_create_by_name(name)
+    crop = Crop.find_or_create_by(name: name)
     crop.update_attributes(
       :en_wikipedia_url => en_wikipedia_url,
       :creator_id => cropbot.id
diff --git a/app/models/crop_sweeper.rb b/app/models/crop_sweeper.rb
deleted file mode 100644
index fef9927f3..000000000
--- a/app/models/crop_sweeper.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class CropSweeper < ActionController::Caching::Sweeper
-  observe Crop
-
-  def after_create(crop)
-    expire_fragment('homepage_stats')
-    expire_fragment('recent_crops')
-    expire_fragment('full_crop_hierarchy')
-  end
-
-  def after_update(crop)
-    expire_fragment("crop_image_#{crop.id}")
-  end
-
-  def after_destroy(crop)
-    expire_fragment('homepage_stats')
-    expire_fragment('recent_crops')
-    expire_fragment('full_crop_hierarchy')
-  end
-
-end
-
diff --git a/app/models/follow.rb b/app/models/follow.rb
index f8767c10c..d7028c8ed 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -1,5 +1,4 @@
 class Follow < ActiveRecord::Base
-  attr_accessible :followed_id, :follower_id
   belongs_to :follower, class_name: "Member"
   belongs_to :followed, class_name: "Member"
   validates :follower_id, uniqueness: { :scope => :followed_id }
diff --git a/app/models/forum.rb b/app/models/forum.rb
index b673dbf19..fd4a79509 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -1,7 +1,7 @@
 class Forum < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, use: :slugged
-  attr_accessible :description, :name, :owner_id, :slug
+  friendly_id :name, use: [:slugged, :finders]
+
   has_many :posts
   belongs_to :owner, :class_name => "Member"
 
diff --git a/app/models/forum_sweeper.rb b/app/models/forum_sweeper.rb
deleted file mode 100644
index cccffc524..000000000
--- a/app/models/forum_sweeper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class ForumSweeper < ActionController::Caching::Sweeper
-  observe Forum
-
-  def after_create(forum)
-    expire_fragment('homepage_forums')
-  end
-
-  def after_update(forum)
-    expire_fragment('homepage_forums')
-  end
-
-  def after_destroy(forum)
-    expire_fragment('homepage_forums')
-  end
-
-end
diff --git a/app/models/garden.rb b/app/models/garden.rb
index 6465a474a..61e51d97d 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -1,13 +1,10 @@
 class Garden < ActiveRecord::Base
   include Geocodable
   extend FriendlyId
-  friendly_id :garden_slug, use: :slugged
-
-  attr_accessible :name, :slug, :owner_id, :description, :active,
-    :location, :latitude, :longitude, :area, :area_unit
+  friendly_id :garden_slug, use: [:slugged, :finders]
 
   belongs_to :owner, :class_name => 'Member', :foreign_key => 'owner_id'
-  has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
+  has_many :plantings, -> { order(created_at: :desc) }, :dependent => :destroy
   has_many :crops, :through => :plantings
 
   # set up geocoding
@@ -16,9 +13,9 @@ class Garden < ActiveRecord::Base
   after_validation :empty_unwanted_geocodes
   after_save :mark_inactive_garden_plantings_as_finished
 
-  default_scope order("lower(name) asc")
-  scope :active, where(:active => true)
-  scope :inactive, where(:active => false)
+  default_scope { order("lower(name) asc") }
+  scope :active, -> { where(:active => true) }
+  scope :inactive, -> { where(:active => false) }
 
   validates :name,
     :format => {
diff --git a/app/models/garden_sweeper.rb b/app/models/garden_sweeper.rb
deleted file mode 100644
index 3913a7c11..000000000
--- a/app/models/garden_sweeper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class GardenSweeper < ActionController::Caching::Sweeper
-  observe Garden
-
-  def after_create(garden)
-    expire_fragment('homepage_stats')
-    expire_fragment('interesting_members') if garden.owner.interesting?
-    expire_fragment("member_thumbnail_#{garden.owner.id}")
-  end
-
-  def after_destroy(garden)
-    expire_fragment('homepage_stats')
-    expire_fragment('interesting_members') if garden.owner.interesting?
-    expire_fragment("member_thumbnail_#{garden.owner.id}")
-  end
-end
-
diff --git a/app/models/harvest.rb b/app/models/harvest.rb
index 48e9eac19..4e43c6ee7 100644
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -1,10 +1,7 @@
 class Harvest < ActiveRecord::Base
   include ActionView::Helpers::NumberHelper
   extend FriendlyId
-  friendly_id :harvest_slug, use: :slugged
-
-  attr_accessible :crop_id, :harvested_at, :description, :owner_id,
-    :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug
+  friendly_id :harvest_slug, use: [:slugged, :finders]
 
   belongs_to :crop
   belongs_to :owner, :class_name => 'Member'
@@ -21,7 +18,7 @@ class Harvest < ActiveRecord::Base
     end
   end
 
-  default_scope order('created_at DESC')
+  default_scope { order('created_at DESC') }
 
   validates :crop, :presence => {:message => "must be present and exist in our database"}
 
diff --git a/app/models/member.rb b/app/models/member.rb
index 63682bcdf..f23e7e45f 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -2,7 +2,7 @@ class Member < ActiveRecord::Base
   include Geocodable
   extend FriendlyId
 
-  friendly_id :login_name, use: :slugged
+  friendly_id :login_name, use: [:slugged, :finders]
 
   has_many :posts,   :foreign_key => 'author_id'
   has_many :comments, :foreign_key => 'author_id'
@@ -27,18 +27,19 @@ class Member < ActiveRecord::Base
 
   has_many :photos
 
+
+  default_scope { order("lower(login_name) asc") }
+  scope :confirmed, -> { where('confirmed_at IS NOT NULL') }
+  scope :located, -> { where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL") }
+  scope :recently_signed_in, -> { reorder('updated_at DESC') }
+  scope :wants_newsletter, -> { where(:newsletter => true) }
+
   has_many :follows, :class_name => "Follow", :foreign_key => "follower_id"
   has_many :followed, :through => :follows
 
   has_many :inverse_follows, :class_name => "Follow", :foreign_key => "followed_id"
   has_many :followers, :through => :inverse_follows, :source => :follower
 
-  default_scope order("lower(login_name) asc")
-  scope :confirmed, where('confirmed_at IS NOT NULL')
-  scope :located, where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL")
-  scope :recently_signed_in, reorder('updated_at DESC')
-  scope :wants_newsletter, where(:newsletter => true)
-
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
@@ -46,16 +47,6 @@ class Member < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable,
          :confirmable, :lockable, :timeoutable
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :login_name, :email, :password, :password_confirmation,
-    :remember_me, :login,
-    # terms of service
-    :tos_agreement,
-    # profile stuff
-    :bio, :location, :latitude, :longitude,
-    # email settings
-    :show_email, :newsletter, :send_notification_email, :send_planting_reminder
-
   # set up geocoding
   geocoded_by :location
   after_validation :geocode
@@ -80,7 +71,7 @@ class Member < ActiveRecord::Base
       :message => "name is reserved"
     },
     :format => {
-      :with => /^\w+$/,
+      :with => /\A\w+\z/,
       :message => "may only include letters, numbers, or underscores"
     },
     :uniqueness => {
@@ -93,7 +84,7 @@ class Member < ActiveRecord::Base
   # and an account record (for paid accounts etc)
   # we use find_or_create to avoid accidentally creating a second one,
   # which can happen sometimes especially with FactoryGirl associations
-  after_create {|member| Account.find_or_create_by_member_id(:member_id => member.id) }
+  after_create {|member| Account.find_or_create_by(:member_id => member.id) }
 
   after_save :update_newsletter_subscription
 
@@ -243,17 +234,19 @@ class Member < ActiveRecord::Base
     end
   end
 
-  def newsletter_subscribe
+  def newsletter_subscribe(testing=false)
+    return true if (Rails.env.test? && !testing)
     gb = Gibbon::API.new
     res = gb.lists.subscribe({
       :id => Gibbon::API.api_key,
       :email => { :email => email },
       :merge_vars => { :login_name => login_name },
-      :double_optin => false # they alredy confirmed their email with us
+      :double_optin => false # they already confirmed their email with us
     })
   end
 
-  def newsletter_unsubscribe
+  def newsletter_unsubscribe(testing=false)
+    return true if (Rails.env.test? && !testing)
     gb = Gibbon::API.new
     res = gb.lists.unsubscribe({
       :id => ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID'],
diff --git a/app/models/member_sweeper.rb b/app/models/member_sweeper.rb
deleted file mode 100644
index 205131e19..000000000
--- a/app/models/member_sweeper.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class MemberSweeper < ActionController::Caching::Sweeper
-  observe Member
-
-  def after_create(member)
-    expire_fragment('homepage_stats')
-  end
-
-  def after_update(member)
-    expire_fragment('interesting_members') if member.interesting?
-    expire_fragment("interesting_seeds") if member.seeds.tradable.present?
-    expire_fragment("member_thumbnail_#{member.id}")
-
-    if member.plantings.present?
-      member.plantings.each do |p|
-        expire_fragment("plantings_listitem_#{p.id}") if p.interesting?
-      end
-      expire_fragment('interesting_plantings')
-    end
-
-  end
-
-end
-
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3fc48a0c7..304b86b03 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,13 +1,10 @@
 class Notification < ActiveRecord::Base
-  attr_accessible :sender_id, :recipient_id, 
-    :subject, :body, :post_id, :read
-
   belongs_to :sender, :class_name => 'Member'
   belongs_to :recipient, :class_name => 'Member'
   belongs_to :post
 
-  default_scope order('created_at DESC')
-  scope :unread, where(:read => false)
+  default_scope { order('created_at DESC') }
+  scope :unread, -> { where(:read => false) }
 
   before_create :replace_blank_subject
   after_create :send_email
diff --git a/app/models/order.rb b/app/models/order.rb
index 122d83700..e9f97034f 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -1,10 +1,9 @@
 class Order < ActiveRecord::Base
-  attr_accessible :member_id, :completed_at, :referral_code
   belongs_to :member
 
   has_many :order_items, :dependent => :destroy
 
-  default_scope order('created_at DESC')
+  default_scope { order('created_at DESC') }
 
   validates :referral_code, :format => {
     :with => /\A[a-zA-Z0-9 ]*\z/,
diff --git a/app/models/order_item.rb b/app/models/order_item.rb
index 3a06097d1..159876dd5 100644
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -1,6 +1,4 @@
 class OrderItem < ActiveRecord::Base
-  attr_accessible :order_id, :price, :product_id, :quantity
-
   belongs_to :order
   belongs_to :product
 
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 862b9d28b..9ab411d09 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,6 +1,4 @@
 class Photo < ActiveRecord::Base
-  attr_accessible :flickr_photo_id, :owner_id, :title, :license_name,
-    :license_url, :thumbnail_url, :fullsize_url, :link_url
   belongs_to :owner, :class_name => 'Member'
 
   has_and_belongs_to_many :plantings
@@ -10,7 +8,7 @@ class Photo < ActiveRecord::Base
     photo.harvests.clear
   end
 
-  default_scope order("created_at desc")
+  default_scope { order("created_at desc") }
 
   # remove photos that aren't used by anything
   def destroy_if_unused
diff --git a/app/models/photo_sweeper.rb b/app/models/photo_sweeper.rb
deleted file mode 100644
index 1bb388b11..000000000
--- a/app/models/photo_sweeper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class PhotoSweeper < ActionController::Caching::Sweeper
-  observe Photo
-
-  def after_create(photo)
-    expire_fragment('interesting_plantings')
-  end
-
-  def after_destroy(photo)
-    expire_fragment('interesting_plantings')
-  end
-
-end
-
diff --git a/app/models/plant_part.rb b/app/models/plant_part.rb
index 41e8d26ea..33d2292fa 100644
--- a/app/models/plant_part.rb
+++ b/app/models/plant_part.rb
@@ -1,11 +1,9 @@
 class PlantPart < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => :slugged
+  friendly_id :name, :use => [:slugged, :finders]
 
   has_many :harvests
-  has_many :crops, :through => :harvests, :uniq => true
-
-  attr_accessible :name, :slug
+  has_many :crops, -> { uniq }, :through => :harvests
 
   def to_s
     return name
diff --git a/app/models/planting.rb b/app/models/planting.rb
index 889fb2d80..e9c11368b 100644
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -1,10 +1,6 @@
 class Planting < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :planting_slug, use: :slugged
-
-  attr_accessible :crop_id, :description, :garden_id, :planted_at,
-    :quantity, :sunniness, :planted_from, :owner_id, :finished,
-    :finished_at
+  friendly_id :planting_slug, use: [:slugged, :finders]
 
   belongs_to :garden
   belongs_to :owner, :class_name => 'Member', :counter_cache => true
@@ -21,9 +17,9 @@ class Planting < ActiveRecord::Base
     end
   end
 
-  default_scope order("created_at desc")
-  scope :finished, where(:finished => true)
-  scope :current, where(:finished => false)
+  default_scope { order("created_at desc") }
+  scope :finished, -> { where(:finished => true) }
+  scope :current, -> { where(:finished => false) }
 
   delegate :name,
     :en_wikipedia_url,
@@ -32,7 +28,7 @@ class Planting < ActiveRecord::Base
     :to => :crop,
     :prefix => true
 
-  default_scope order("created_at desc")
+  default_scope { order("created_at desc") }
 
   validates :crop_id, :presence => {:message => "must be present and exist in our database"}
 
diff --git a/app/models/planting_sweeper.rb b/app/models/planting_sweeper.rb
deleted file mode 100644
index 8e8de10df..000000000
--- a/app/models/planting_sweeper.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-class PlantingSweeper < ActionController::Caching::Sweeper
-  observe Planting
-
-  def after_create(planting)
-    expire_fragment('homepage_stats')
-    expire_fragment("member_thumbnail_#{planting.owner.id}")
-    expire_fragment("interesting_members") if planting.owner.interesting?
-    expire_fragment("crop_image_#{planting.crop.id}")
-  end
-
-  def after_update(planting)
-    expire_fragment("planting_listitem_#{planting.id}")
-    expire_fragment("planting_image_#{planting.id}")
-    expire_fragment("interesting_plantings")
-  end
-
-  def after_destroy(planting)
-    expire_fragment('homepage_stats')
-    expire_fragment("crop_image_#{planting.crop.id}")
-    expire_fragment('interesting_plantings') if planting.interesting?
-    expire_fragment("interesting_members") if planting.owner.interesting?
-  end
-
-end
-
diff --git a/app/models/post.rb b/app/models/post.rb
index 7f72a4e57..88c6355cc 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,7 +1,6 @@
 class Post < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :author_date_subject, use: :slugged
-  attr_accessible :body, :subject, :author_id, :forum_id
+  friendly_id :author_date_subject, use: [:slugged, :finders]
   belongs_to :author, :class_name => 'Member'
   belongs_to :forum
   has_many :comments, :dependent => :destroy
@@ -11,7 +10,7 @@ class Post < ActiveRecord::Base
   # also has_many notifications, but kinda meaningless to get at them
   # from this direction, so we won't set up an association for now.
 
-  default_scope order("created_at desc")
+  default_scope { order("created_at desc") }
 
   validates :subject,
     :format => {
diff --git a/app/models/post_sweeper.rb b/app/models/post_sweeper.rb
deleted file mode 100644
index e6ad03427..000000000
--- a/app/models/post_sweeper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class PostSweeper < ActionController::Caching::Sweeper
-  observe Post
-
-  def after_create(post)
-    expire_fragment('recent_posts')
-  end
-
-  def after_update(post)
-    expire_fragment('recent_posts')
-  end
-
-  def after_destroy(post)
-    expire_fragment('recent_posts')
-  end
-
-end
diff --git a/app/models/product.rb b/app/models/product.rb
index 70193ea7a..876207f47 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -1,7 +1,4 @@
 class Product < ActiveRecord::Base
-  attr_accessible :description, :min_price, :recommended_price, :name,
-  :account_type_id, :paid_months
-
   has_and_belongs_to_many :orders
   belongs_to :account_type
 
diff --git a/app/models/role.rb b/app/models/role.rb
index 284fdd0d8..a3364fb89 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,7 +1,7 @@
 class Role < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, use: :slugged
-  attr_accessible :description, :name, :members, :slug
+  friendly_id :name, use: [:slugged, :finders]
+
   has_and_belongs_to_many :members
 
   class << self
diff --git a/app/models/scientific_name.rb b/app/models/scientific_name.rb
index 56c86b21b..1a585e713 100644
--- a/app/models/scientific_name.rb
+++ b/app/models/scientific_name.rb
@@ -1,5 +1,4 @@
 class ScientificName < ActiveRecord::Base
-  attr_accessible :crop_id, :scientific_name, :creator_id
   belongs_to :crop
   belongs_to :creator, :class_name => 'Member'
 end
diff --git a/app/models/scientific_name_sweeper.rb b/app/models/scientific_name_sweeper.rb
deleted file mode 100644
index 2ac626526..000000000
--- a/app/models/scientific_name_sweeper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class ScientificNameSweeper < ActionController::Caching::Sweeper
-  observe ScientificName
-
-  def after_create(scientific_name)
-    expire_fragment("crop_image_#{scientific_name.crop.id}")
-  end
-
-  def after_update(scientific_name)
-    expire_fragment("crop_image_#{scientific_name.crop.id}")
-  end
-
-  def after_destroy(scientific_name)
-    expire_fragment("crop_image_#{scientific_name.crop.id}")
-  end
-
-end
-
diff --git a/app/models/seed.rb b/app/models/seed.rb
index 38cd3b714..c7128da72 100644
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -1,21 +1,18 @@
 class Seed < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :seed_slug, use: :slugged
-
-  attr_accessible :owner_id, :crop_id, :description, :quantity, :plant_before,
-    :tradable_to, :slug
+  friendly_id :seed_slug, use: [:slugged, :finders]
 
   belongs_to :crop
   belongs_to :owner, :class_name => 'Member', :foreign_key => 'owner_id'
 
-  default_scope order("created_at desc")
+  default_scope { order("created_at desc") }
 
   validates :crop, :presence => {:message => "must be present and exist in our database"}
   validates :quantity,
     :numericality => { :only_integer => true },
     :allow_nil => true
 
-  scope :tradable, where("tradable_to != 'nowhere'")
+  scope :tradable, -> { where("tradable_to != 'nowhere'") }
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally)
   validates :tradable_to, :inclusion => { :in => TRADABLE_TO_VALUES,
diff --git a/app/models/seed_sweeper.rb b/app/models/seed_sweeper.rb
deleted file mode 100644
index 1b7d663a4..000000000
--- a/app/models/seed_sweeper.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class SeedSweeper < ActionController::Caching::Sweeper
-  observe Seed
-
-  def after_create(seed)
-    if seed.tradable? && seed.interesting?
-      expire_fragment('interesting_seeds')
-    end
-    expire_fragment('interesting_members') if seed.owner.interesting?
-    expire_fragment("member_thumbnail_#{seed.owner.id}")
-  end
-
-  def after_update(seed)
-    expire_fragment('interesting_seeds')
-  end
-
-  def after_destroy(seed)
-    if seed.tradable? && seed.interesting?
-      expire_fragment('interesting_seeds')
-    end
-    expire_fragment('interesting_members') if seed.owner.interesting?
-    expire_fragment("member_thumbnail_#{seed.owner.id}")
-  end
-
-end
-
-
diff --git a/app/views/crops/_image_with_popover.html.haml b/app/views/crops/_image_with_popover.html.haml
index 46e1b4ee8..0b9e969e0 100644
--- a/app/views/crops/_image_with_popover.html.haml
+++ b/app/views/crops/_image_with_popover.html.haml
@@ -1,4 +1,4 @@
-- cache "crop_image_#{crop.id}" do
+- cache crop do
   = link_to |
     image_tag( |
       crop.default_photo ?  crop.default_photo.thumbnail_url : 'placeholder_150.png', |
diff --git a/app/views/crops/hierarchy.html.haml b/app/views/crops/hierarchy.html.haml
index 8391e7572..11bdb4832 100644
--- a/app/views/crops/hierarchy.html.haml
+++ b/app/views/crops/hierarchy.html.haml
@@ -5,5 +5,5 @@
   = succeed "." do
     = link_to "crops database", crops_path
 
-- cache("full_crop_hierarchy") do
+- cache cache_key_for(Crop) do
   = render :partial => "hierarchy", :locals => { :display_crops => @crops }
diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml
index ce3c775ce..4c3a3e98f 100644
--- a/app/views/home/_crops.html.haml
+++ b/app/views/home/_crops.html.haml
@@ -1,19 +1,19 @@
 .row
   .col-md-6.hidden-xs
-    - cache "interesting_crops", :expires_in => 1.day do
+    - cache cache_key_for(Crop), :expires_in => 1.day do
       %h2= t('.our_crops')
       - Crop.interesting.each do |c|
         .col-md-3{:style => 'margin:0px; padding: 3px'}
           = render :partial => 'crops/image_with_popover', :locals => { :crop => c }
 
   .col-md-6
-    - cache "interesting_plantings" do
+    - cache cache_key_for(Planting) do
       %h2= t('.recently_planted')
       = render :partial => 'plantings/list', :locals => { :plantings => Planting.interesting.first(4) }
 
 .row
   .col-md-12
-    - cache "recent_crops" do
+    - cache cache_key_for(Crop) do
       %p{ :style => 'margin-top: 11.25px' }
         %strong
           #{t('.recently_added')}:
diff --git a/app/views/home/_discuss.html.haml b/app/views/home/_discuss.html.haml
index 22b9972b9..de1d362f1 100644
--- a/app/views/home/_discuss.html.haml
+++ b/app/views/home/_discuss.html.haml
@@ -1,11 +1,10 @@
 %h2= t('.discussion')
 
-- cache "recent_posts" do
-  - posts = Post.limit(6)
-  - if posts
-    =render :partial => "posts/summary", :locals => { :posts => posts, :howmany => 6 }
+- posts = Post.limit(6)
+- if posts
+  =render :partial => "posts/summary", :locals => { :posts => posts, :howmany => 6 }
 
-- cache "homepage_forums" do
+- cache cache_key_for(Forum) do
   - forums = Forum.all
   - if forums
     %ul.list-inline
diff --git a/app/views/home/_keep_in_touch.html.haml b/app/views/home/_keep_in_touch.html.haml
index 536cd4071..66360e2df 100644
--- a/app/views/home/_keep_in_touch.html.haml
+++ b/app/views/home/_keep_in_touch.html.haml
@@ -14,4 +14,4 @@
 
 %p
   = link_to(image_tag("email_32.png", :alt => ''), 'http://blog.growstuff.org/newsletter', :target => "_blank")
-  = t('.newsletter_html', link: link_to(t('.newsletter_linktext'), 'http://blog.growstuff.org/newsletter', :target => "_blank"))
\ No newline at end of file
+  = t('.newsletter_html', link: link_to(t('.newsletter_linktext'), 'http://blog.growstuff.org/newsletter', :target => "_blank"))
diff --git a/app/views/home/_members.html.haml b/app/views/home/_members.html.haml
index 25cb0867b..ac9f10957 100644
--- a/app/views/home/_members.html.haml
+++ b/app/views/home/_members.html.haml
@@ -1,4 +1,4 @@
-- cache "interesting_members" do
+- cache cache_key_for(Member) do
   .hidden-xs
     - members = Member.interesting.first(6)
     - if members.present?
diff --git a/app/views/home/_seeds.html.haml b/app/views/home/_seeds.html.haml
index 52d996373..817af347c 100644
--- a/app/views/home/_seeds.html.haml
+++ b/app/views/home/_seeds.html.haml
@@ -3,7 +3,7 @@
 
   %h2= t('.title')
 
-  - cache "interesting_seeds" do
+  - cache cache_key_for(Seed) do
     - if seeds.length > 0
 
       %table.table.table-striped
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index d68f6dc73..691de3681 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -9,7 +9,7 @@
         %span.icon-bar
         %span.icon-bar
       %a.navbar-brand(href=root_path)
-        = image_tag("/assets/growstuff-brand.png", :size => "200x50", :alt => ENV['GROWSTUFF_SITE_NAME'])
+        = image_tag("growstuff-brand.png", :size => "200x50", :alt => ENV['GROWSTUFF_SITE_NAME'])
     .navbar-collapse.collapse#navbar-collapse
       %ul.nav.navbar-nav
         %li.dropdown<
diff --git a/app/views/layouts/_meta.html.haml b/app/views/layouts/_meta.html.haml
index c5313fb8d..13acb28bc 100644
--- a/app/views/layouts/_meta.html.haml
+++ b/app/views/layouts/_meta.html.haml
@@ -16,5 +16,5 @@
     = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
   = stylesheet_link_tag "application", :media => "all"
 
-  %link(href="/assets/growstuff-apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed")
-  = favicon_link_tag '/assets/favicon.ico'
+  %link(href="/growstuff-apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed")
+  = favicon_link_tag 'favicon.ico'
diff --git a/app/views/members/_thumbnail.html.haml b/app/views/members/_thumbnail.html.haml
index bbb06f2f7..c90faba8a 100644
--- a/app/views/members/_thumbnail.html.haml
+++ b/app/views/members/_thumbnail.html.haml
@@ -1,4 +1,4 @@
-- cache "member_thumbnail_#{member.id}" do
+- cache member do
   .row
     .member-thumbnail
       .col-md-3
diff --git a/app/views/plantings/_image_with_popover.html.haml b/app/views/plantings/_image_with_popover.html.haml
index 01d39128e..0e9b46a7d 100644
--- a/app/views/plantings/_image_with_popover.html.haml
+++ b/app/views/plantings/_image_with_popover.html.haml
@@ -1,4 +1,4 @@
-- cache "planting_image_#{planting.id}" do
+- cache planting do
   = link_to |
     image_tag( |
       planting.photos.present? ? planting.photos.first.thumbnail_url : 'placeholder_150.png', |
diff --git a/app/views/plantings/_list.html.haml b/app/views/plantings/_list.html.haml
index 0efc1be37..2ea1204ff 100644
--- a/app/views/plantings/_list.html.haml
+++ b/app/views/plantings/_list.html.haml
@@ -1,5 +1,5 @@
 - plantings.each do |p|
-  - cache "plantings_listitem_#{p.id}" do
+  - cache p do
     .row
       .col-md-3{:style => 'padding-bottom: 6px'}
         = render :partial => 'plantings/image_with_popover', :locals => { :planting => p }
diff --git a/app/views/posts/_summary.html.haml b/app/views/posts/_summary.html.haml
index 6e8e30895..f04dd2fb0 100644
--- a/app/views/posts/_summary.html.haml
+++ b/app/views/posts/_summary.html.haml
@@ -8,13 +8,14 @@
       %th.hidden-xs Comments
 
     - posts.recently_active[0..howmany-1].each do |post|
-      %tr
-        %td
-          = link_to truncate(strip_tags(post.subject), :length => 40, :separator => ' '), post
-        %td.hidden-xs
-          =link_to post.author, post.author
-        %td
-          = distance_of_time_in_words(post.recent_activity, Time.zone.now)
-          ago
-        %td.hidden-xs
-          = post.comments.count.to_s
+      - cache post do
+        %tr
+          %td
+            = link_to truncate(strip_tags(post.subject), :length => 40, :separator => ' '), post
+          %td.hidden-xs
+            =link_to post.author, post.author
+          %td
+            = distance_of_time_in_words(post.recent_activity, Time.zone.now)
+            ago
+          %td.hidden-xs
+            = post.comments.count.to_s
diff --git a/app/views/shared/_account_status.html.haml b/app/views/shared/_account_status.html.haml
index 5ee44faff..7c14f7d4a 100644
--- a/app/views/shared/_account_status.html.haml
+++ b/app/views/shared/_account_status.html.haml
@@ -9,5 +9,5 @@
     %strong Paid until:
     = current_member.account.paid_until_string
 
-- if ! current_member.is_paid?
+- if !current_member.is_paid?
   = link_to "Upgrade and support #{ENV['GROWSTUFF_SITE_NAME']}", shop_path, :class => 'btn btn-primary'
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..728cd85aa
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 000000000..17240489f
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/config/application.rb b/config/application.rb
index 5b01d3aa8..113d0bc66 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'openssl'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -25,6 +26,8 @@ module Growstuff
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 
+    I18n.config.enforce_available_locales = true
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'UTC'
@@ -59,7 +62,7 @@ module Growstuff
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7b25f588c..45d7b96bf 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,14 +1,14 @@
 Growstuff::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Do not eager load code on boot.
+  config.eager_load = false
+
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
 
@@ -25,19 +25,24 @@ Growstuff::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 
   # Expands the lines which load the assets
   config.assets.debug = true
 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
   # Growstuff config
   config.new_crops_request_link = "http://example.com/not-a-real-url"
   config.action_mailer.default_url_options = { :host => 'localhost:8080' }
@@ -68,4 +73,6 @@ Growstuff::Application.configure do
     ::STANDARD_GATEWAY = ActiveMerchant::Billing::PaypalGateway.new(paypal_options)
     ::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
   end
+
+  config.action_controller.action_on_unpermitted_parameters = :raise
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a5b131a4b..523418b32 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,6 +1,12 @@
 Growstuff::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -11,8 +17,9 @@ Growstuff::Application.configure do
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  config.assets.css_compressor = :sass
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
   config.assets.compile = true
@@ -20,9 +27,6 @@ Growstuff::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
-
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
@@ -45,15 +49,10 @@ Growstuff::Application.configure do
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
@@ -61,9 +60,11 @@ Growstuff::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 
   # Growstuff configuration
   config.new_crops_request_link = "http://growstuff.org/posts/skud-20130319-requests-for-new-crops"
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 6e00f6327..d8f0e530c 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,6 +1,12 @@
 Growstuff::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -11,8 +17,9 @@ Growstuff::Application.configure do
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  config.assets.css_compressor = :sass
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
   config.assets.compile = true
@@ -20,9 +27,6 @@ Growstuff::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
-
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
@@ -45,15 +49,10 @@ Growstuff::Application.configure do
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
@@ -61,9 +60,11 @@ Growstuff::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 
   # Growstuff configuration
   config.new_crops_request_link = "http://example.com/not-a-real-url"
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6fb8cad3e..ffdc4c972 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,6 +1,11 @@
 Growstuff::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
@@ -13,9 +18,6 @@ Growstuff::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -31,12 +33,12 @@ Growstuff::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+  
   # Growstuff config
   config.new_crops_request_link = "http://example.com/not-a-real-url"
   config.action_mailer.default_url_options = { :host => 'localhost:8080' }
diff --git a/config/initializers/friendly_id.rb b/config/initializers/friendly_id.rb
new file mode 100644
index 000000000..3a88f87be
--- /dev/null
+++ b/config/initializers/friendly_id.rb
@@ -0,0 +1,88 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  # config.use :reserved
+
+  # config.reserved_words = %w(new edit index session login logout users admin
+  #   stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  # config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end
diff --git a/config/routes.rb b/config/routes.rb
index 1b9c30c05..3d8c0b1ce 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,29 +11,29 @@ Growstuff::Application.routes.draw do
   resources :authentications
 
   resources :plantings
-  match '/plantings/owner/:owner' => 'plantings#index', :as => 'plantings_by_owner'
-  match '/plantings/crop/:crop' => 'plantings#index', :as => 'plantings_by_crop'
+  get '/plantings/owner/:owner' => 'plantings#index', :as => 'plantings_by_owner'
+  get '/plantings/crop/:crop' => 'plantings#index', :as => 'plantings_by_crop'
 
   resources :gardens
-  match '/gardens/owner/:owner' => 'gardens#index', :as => 'gardens_by_owner'
+  get '/gardens/owner/:owner' => 'gardens#index', :as => 'gardens_by_owner'
 
   resources :seeds
-  match '/seeds/owner/:owner' => 'seeds#index', :as => 'seeds_by_owner'
-  match '/seeds/crop/:crop' => 'seeds#index', :as => 'seeds_by_crop'
+  get '/seeds/owner/:owner' => 'seeds#index', :as => 'seeds_by_owner'
+  get '/seeds/crop/:crop' => 'seeds#index', :as => 'seeds_by_crop'
 
   resources :harvests
-  match '/harvests/owner/:owner' => 'harvests#index', :as => 'harvests_by_owner'
-  match '/harvests/crop/:crop' => 'harvests#index', :as => 'harvests_by_crop'
+  get '/harvests/owner/:owner' => 'harvests#index', :as => 'harvests_by_owner'
+  get '/harvests/crop/:crop' => 'harvests#index', :as => 'harvests_by_crop'
 
   resources :posts
-  match '/posts/author/:author' => 'posts#index', :as => 'posts_by_author'
+  get '/posts/author/:author' => 'posts#index', :as => 'posts_by_author'
 
   resources :scientific_names
   resources :alternate_names
 
-  match 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
-  match 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
-  match 'crops/search' => 'crops#search', :as => 'crops_search'
+  get 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
+  get 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
+  get 'crops/search' => 'crops#search', :as => 'crops_search'
   resources :crops
 
   resources :comments
@@ -54,9 +54,9 @@ Growstuff::Application.routes.draw do
   resources :account_types
   resources :accounts
   resources :orders
-  match 'orders/:id/checkout' => 'orders#checkout', :as => 'checkout_order'
-  match 'orders/:id/complete' => 'orders#complete', :as => 'complete_order'
-  match 'orders/:id/cancel' => 'orders#cancel', :as => 'cancel_order'
+  get 'orders/:id/checkout' => 'orders#checkout', :as => 'checkout_order'
+  get 'orders/:id/complete' => 'orders#complete', :as => 'complete_order'
+  get 'orders/:id/cancel' => 'orders#cancel', :as => 'cancel_order'
 
   resources :order_items
   resources :products
@@ -64,25 +64,25 @@ Growstuff::Application.routes.draw do
   get "home/index"
   root :to => 'home#index'
 
-  match 'auth/:provider/callback' => 'authentications#create'
+  get 'auth/:provider/callback' => 'authentications#create'
 
 
-  match '/policy/:action' => 'policy#:action'
+  get '/policy/:action' => 'policy#:action'
 
-  match '/support' => 'support#index'
-  match '/support/:action' => 'support#:action'
+  get '/support' => 'support#index'
+  get '/support/:action' => 'support#:action'
 
-  match '/about' => 'about#index'
-  match '/about/:action' => 'about#:action'
+  get '/about' => 'about#index'
+  get '/about/:action' => 'about#:action'
 
-  match '/shop' => 'shop#index'
-  match '/shop/:action' => 'shop#:action'
+  get '/shop' => 'shop#index'
+  get '/shop/:action' => 'shop#:action'
 
-  match '/admin/orders' => 'admin/orders#index'
-  match '/admin/orders/:action' => 'admin/orders#:action'
-  match '/admin' => 'admin#index'
-  match '/admin/newsletter' => 'admin#newsletter', :as => :admin_newsletter
-  match '/admin/:action' => 'admin#:action'
+  get '/admin/orders' => 'admin/orders#index'
+  get '/admin/orders/:action' => 'admin/orders#:action'
+  get '/admin' => 'admin#index'
+  get '/admin/newsletter' => 'admin#newsletter', :as => :admin_newsletter
+  get '/admin/:action' => 'admin#:action'
 
 
 
diff --git a/db/schema.rb b/db/schema.rb
index cd0dd7466..9c4137f40 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,103 +9,106 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141119130555) do
+ActiveRecord::Schema.define(version: 20141119130555) do
 
-  create_table "account_types", :force => true do |t|
-    t.string   "name",              :null => false
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "account_types", force: true do |t|
+    t.string   "name",              null: false
     t.boolean  "is_paid"
     t.boolean  "is_permanent_paid"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "accounts", :force => true do |t|
-    t.integer  "member_id",       :null => false
+  create_table "accounts", force: true do |t|
+    t.integer  "member_id",       null: false
     t.integer  "account_type_id"
     t.datetime "paid_until"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "alternate_names", :force => true do |t|
-    t.string   "name",       :null => false
-    t.integer  "crop_id",    :null => false
-    t.integer  "creator_id", :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "alternate_names", force: true do |t|
+    t.string   "name",       null: false
+    t.integer  "crop_id",    null: false
+    t.integer  "creator_id", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "authentications", :force => true do |t|
-    t.integer  "member_id",  :null => false
-    t.string   "provider",   :null => false
+  create_table "authentications", force: true do |t|
+    t.integer  "member_id",  null: false
+    t.string   "provider",   null: false
     t.string   "uid"
     t.string   "token"
     t.string   "secret"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "name"
   end
 
-  add_index "authentications", ["member_id"], :name => "index_authentications_on_member_id"
+  add_index "authentications", ["member_id"], name: "index_authentications_on_member_id", using: :btree
 
-  create_table "comments", :force => true do |t|
-    t.integer  "post_id",    :null => false
-    t.integer  "author_id",  :null => false
-    t.text     "body",       :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "comments", force: true do |t|
+    t.integer  "post_id",    null: false
+    t.integer  "author_id",  null: false
+    t.text     "body",       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "crops", :force => true do |t|
-    t.string   "name",                            :null => false
+  create_table "crops", force: true do |t|
+    t.string   "name",                         null: false
     t.string   "en_wikipedia_url"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
     t.integer  "parent_id"
-    t.integer  "plantings_count",  :default => 0
+    t.integer  "plantings_count",  default: 0
     t.integer  "creator_id"
   end
 
-  add_index "crops", ["name"], :name => "index_crops_on_name"
-  add_index "crops", ["slug"], :name => "index_crops_on_slug", :unique => true
+  add_index "crops", ["name"], name: "index_crops_on_name", using: :btree
+  add_index "crops", ["slug"], name: "index_crops_on_slug", unique: true, using: :btree
 
-  create_table "crops_posts", :id => false, :force => true do |t|
+  create_table "crops_posts", id: false, force: true do |t|
     t.integer "crop_id"
     t.integer "post_id"
   end
 
-  add_index "crops_posts", ["crop_id", "post_id"], :name => "index_crops_posts_on_crop_id_and_post_id"
-  add_index "crops_posts", ["crop_id"], :name => "index_crops_posts_on_crop_id"
+  add_index "crops_posts", ["crop_id", "post_id"], name: "index_crops_posts_on_crop_id_and_post_id", using: :btree
+  add_index "crops_posts", ["crop_id"], name: "index_crops_posts_on_crop_id", using: :btree
 
-  create_table "follows", :force => true do |t|
+  create_table "follows", force: true do |t|
     t.integer  "follower_id"
     t.integer  "followed_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "forums", :force => true do |t|
-    t.string   "name",        :null => false
-    t.text     "description", :null => false
-    t.integer  "owner_id",    :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+  create_table "forums", force: true do |t|
+    t.string   "name",        null: false
+    t.text     "description", null: false
+    t.integer  "owner_id",    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
   end
 
-  add_index "forums", ["slug"], :name => "index_forums_on_slug", :unique => true
+  add_index "forums", ["slug"], name: "index_forums_on_slug", unique: true, using: :btree
 
-  create_table "gardens", :force => true do |t|
-    t.string   "name",                          :null => false
+  create_table "gardens", force: true do |t|
+    t.string   "name",                       null: false
     t.integer  "owner_id"
-    t.string   "slug",                          :null => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
+    t.string   "slug",                       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text     "description"
-    t.boolean  "active",      :default => true
+    t.boolean  "active",      default: true
     t.string   "location"
     t.float    "latitude"
     t.float    "longitude"
@@ -113,38 +116,38 @@ ActiveRecord::Schema.define(:version => 20141119130555) do
     t.string   "area_unit"
   end
 
-  add_index "gardens", ["owner_id"], :name => "index_gardens_on_user_id"
-  add_index "gardens", ["slug"], :name => "index_gardens_on_slug", :unique => true
+  add_index "gardens", ["owner_id"], name: "index_gardens_on_owner_id", using: :btree
+  add_index "gardens", ["slug"], name: "index_gardens_on_slug", unique: true, using: :btree
 
-  create_table "harvests", :force => true do |t|
-    t.integer  "crop_id",         :null => false
-    t.integer  "owner_id",        :null => false
+  create_table "harvests", force: true do |t|
+    t.integer  "crop_id",         null: false
+    t.integer  "owner_id",        null: false
     t.date     "harvested_at"
     t.decimal  "quantity"
     t.string   "unit"
     t.text     "description"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
     t.decimal  "weight_quantity"
     t.string   "weight_unit"
     t.integer  "plant_part_id"
   end
 
-  create_table "harvests_photos", :id => false, :force => true do |t|
+  create_table "harvests_photos", id: false, force: true do |t|
     t.integer "photo_id"
     t.integer "harvest_id"
   end
 
-  add_index "harvests_photos", ["harvest_id", "photo_id"], :name => "index_harvests_photos_on_harvest_id_and_photo_id"
+  add_index "harvests_photos", ["harvest_id", "photo_id"], name: "index_harvests_photos_on_harvest_id_and_photo_id", using: :btree
 
-  create_table "members", :force => true do |t|
-    t.string   "email",                   :default => "",   :null => false
-    t.string   "encrypted_password",      :default => "",   :null => false
+  create_table "members", force: true do |t|
+    t.string   "email",                   default: "",   null: false
+    t.string   "encrypted_password",      default: "",   null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",           :default => 0
+    t.integer  "sign_in_count",           default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -153,11 +156,11 @@ ActiveRecord::Schema.define(:version => 20141119130555) do
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",         :default => 0
+    t.integer  "failed_attempts",         default: 0
     t.string   "unlock_token"
     t.datetime "locked_at"
-    t.datetime "created_at",                                :null => false
-    t.datetime "updated_at",                                :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "login_name"
     t.string   "slug"
     t.boolean  "tos_agreement"
@@ -165,47 +168,47 @@ ActiveRecord::Schema.define(:version => 20141119130555) do
     t.string   "location"
     t.float    "latitude"
     t.float    "longitude"
-    t.boolean  "send_notification_email", :default => true
+    t.boolean  "send_notification_email", default: true
     t.text     "bio"
     t.integer  "plantings_count"
     t.boolean  "newsletter"
-    t.boolean  "send_planting_reminder",  :default => true
+    t.boolean  "send_planting_reminder",  default: true
   end
 
-  add_index "members", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true
-  add_index "members", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "members", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
-  add_index "members", ["slug"], :name => "index_users_on_slug", :unique => true
-  add_index "members", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
+  add_index "members", ["confirmation_token"], name: "index_members_on_confirmation_token", unique: true, using: :btree
+  add_index "members", ["email"], name: "index_members_on_email", unique: true, using: :btree
+  add_index "members", ["reset_password_token"], name: "index_members_on_reset_password_token", unique: true, using: :btree
+  add_index "members", ["slug"], name: "index_members_on_slug", unique: true, using: :btree
+  add_index "members", ["unlock_token"], name: "index_members_on_unlock_token", unique: true, using: :btree
 
-  create_table "members_roles", :id => false, :force => true do |t|
+  create_table "members_roles", id: false, force: true do |t|
     t.integer "member_id"
     t.integer "role_id"
   end
 
-  create_table "notifications", :force => true do |t|
+  create_table "notifications", force: true do |t|
     t.integer  "sender_id"
-    t.integer  "recipient_id",                    :null => false
+    t.integer  "recipient_id",                 null: false
     t.string   "subject"
     t.text     "body"
-    t.boolean  "read",         :default => false
+    t.boolean  "read",         default: false
     t.integer  "post_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "order_items", :force => true do |t|
+  create_table "order_items", force: true do |t|
     t.integer  "order_id"
     t.integer  "product_id"
     t.integer  "price"
     t.integer  "quantity"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "orders", :force => true do |t|
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
+  create_table "orders", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.datetime "completed_at"
     t.integer  "member_id"
     t.string   "paypal_express_token"
@@ -213,109 +216,108 @@ ActiveRecord::Schema.define(:version => 20141119130555) do
     t.string   "referral_code"
   end
 
-  create_table "orders_products", :id => false, :force => true do |t|
+  create_table "orders_products", id: false, force: true do |t|
     t.integer "order_id"
     t.integer "product_id"
   end
 
-  create_table "photos", :force => true do |t|
-    t.integer  "owner_id",        :null => false
-    t.string   "thumbnail_url",   :null => false
-    t.string   "fullsize_url",    :null => false
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.string   "title",           :null => false
-    t.string   "license_name",    :null => false
+  create_table "photos", force: true do |t|
+    t.integer  "owner_id",        null: false
+    t.string   "thumbnail_url",   null: false
+    t.string   "fullsize_url",    null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "title",           null: false
+    t.string   "license_name",    null: false
     t.string   "license_url"
-    t.string   "link_url",        :null => false
+    t.string   "link_url",        null: false
     t.string   "flickr_photo_id"
   end
 
-  create_table "photos_plantings", :id => false, :force => true do |t|
+  create_table "photos_plantings", id: false, force: true do |t|
     t.integer "photo_id"
     t.integer "planting_id"
   end
 
-  create_table "plant_parts", :force => true do |t|
+  create_table "plant_parts", force: true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
   end
 
-  create_table "plantings", :force => true do |t|
-    t.integer  "garden_id",                       :null => false
-    t.integer  "crop_id",                         :null => false
+  create_table "plantings", force: true do |t|
+    t.integer  "garden_id",                    null: false
+    t.integer  "crop_id",                      null: false
     t.date     "planted_at"
     t.integer  "quantity"
     t.text     "description"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
     t.string   "sunniness"
     t.string   "planted_from"
     t.integer  "owner_id"
-    t.boolean  "finished",     :default => false
+    t.boolean  "finished",     default: false
     t.date     "finished_at"
   end
 
-  add_index "plantings", ["slug"], :name => "index_plantings_on_slug", :unique => true
+  add_index "plantings", ["slug"], name: "index_plantings_on_slug", unique: true, using: :btree
 
-  create_table "posts", :force => true do |t|
-    t.integer  "author_id",  :null => false
-    t.string   "subject",    :null => false
-    t.text     "body",       :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "posts", force: true do |t|
+    t.integer  "author_id",  null: false
+    t.string   "subject",    null: false
+    t.text     "body",       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
     t.integer  "forum_id"
-    t.integer  "parent_id"
   end
 
-  add_index "posts", ["created_at", "author_id"], :name => "index_updates_on_created_at_and_user_id"
-  add_index "posts", ["slug"], :name => "index_updates_on_slug", :unique => true
+  add_index "posts", ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id", using: :btree
+  add_index "posts", ["slug"], name: "index_posts_on_slug", unique: true, using: :btree
 
-  create_table "products", :force => true do |t|
-    t.string   "name",              :null => false
-    t.text     "description",       :null => false
-    t.integer  "min_price",         :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+  create_table "products", force: true do |t|
+    t.string   "name",              null: false
+    t.text     "description",       null: false
+    t.integer  "min_price",         null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "account_type_id"
     t.integer  "paid_months"
     t.integer  "recommended_price"
   end
 
-  create_table "roles", :force => true do |t|
-    t.string   "name",        :null => false
+  create_table "roles", force: true do |t|
+    t.string   "name",        null: false
     t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "slug"
   end
 
-  add_index "roles", ["slug"], :name => "index_roles_on_slug", :unique => true
+  add_index "roles", ["slug"], name: "index_roles_on_slug", unique: true, using: :btree
 
-  create_table "scientific_names", :force => true do |t|
-    t.string   "scientific_name", :null => false
-    t.integer  "crop_id",         :null => false
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+  create_table "scientific_names", force: true do |t|
+    t.string   "scientific_name", null: false
+    t.integer  "crop_id",         null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "creator_id"
   end
 
-  create_table "seeds", :force => true do |t|
-    t.integer  "owner_id",                            :null => false
-    t.integer  "crop_id",                             :null => false
+  create_table "seeds", force: true do |t|
+    t.integer  "owner_id",                         null: false
+    t.integer  "crop_id",                          null: false
     t.text     "description"
     t.integer  "quantity"
     t.date     "plant_before"
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
-    t.string   "tradable_to",  :default => "nowhere"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "tradable_to",  default: "nowhere"
     t.string   "slug"
   end
 
-  add_index "seeds", ["slug"], :name => "index_seeds_on_slug", :unique => true
+  add_index "seeds", ["slug"], name: "index_seeds_on_slug", unique: true, using: :btree
 
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 2aa4fd12b..98ac2c24a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -12,8 +12,8 @@ def load_data
     load_crops
     load_plant_parts
 
-    # for development environments only
-    if Rails.env.development?
+    # for development and staging environments only
+    if Rails.env.development? || Rails.env.staging?
       load_test_users
       load_admin_users
       load_paid_account_types
@@ -156,7 +156,7 @@ def load_plant_parts
     'other'
   ]
   plant_parts.each do |pp|
-    PlantPart.find_or_create_by_name!(pp)
+    PlantPart.find_or_create_by!(name: pp)
   end
 end
 
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index d78f6c66f..656961fd3 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -98,36 +98,36 @@ namespace :growstuff do
     desc "June 2013: create account types and products."
     task :setup_shop => :environment do
       puts "Adding account types..."
-      AccountType.find_or_create_by_name(
+      AccountType.find_or_create_by(
         :name => "Free",
         :is_paid => false,
         :is_permanent_paid => false
       )
-      @paid_account = AccountType.find_or_create_by_name(
+      @paid_account = AccountType.find_or_create_by( 
         :name => "Paid",
         :is_paid => true,
         :is_permanent_paid => false
       )
-      @seed_account = AccountType.find_or_create_by_name(
+      @seed_account = AccountType.find_or_create_by( 
         :name => "Seed",
         :is_paid => true,
         :is_permanent_paid => true
       )
-      @staff_account = AccountType.find_or_create_by_name(
+      @staff_account = AccountType.find_or_create_by( 
         :name => "Staff",
         :is_paid => true,
         :is_permanent_paid => true
       )
 
       puts "Adding products..."
-      Product.find_or_create_by_name(
+      Product.find_or_create_by( 
         :name => "Annual subscription",
         :description => "An annual subscription gives you access to paid account features for one year.  Does not auto-renew.",
         :min_price => 3000,
         :account_type_id => @paid_account.id,
         :paid_months => 12
       )
-      Product.find_or_create_by_name(
+      Product.find_or_create_by( 
         :name => "Seed account",
         :description => "A seed account helps Growstuff grow in its early days.  It gives you all the features of a paid account, in perpetuity.  This account type never expires.",
         :min_price => 15000,
@@ -252,7 +252,7 @@ namespace :growstuff do
         'other'
       ]
       plant_parts.each do |pp|
-        PlantPart.find_or_create_by_name!(pp)
+        PlantPart.find_or_create_by!(name: pp)
       end
     end
 
diff --git a/spec/controllers/account_types_controller_spec.rb b/spec/controllers/account_types_controller_spec.rb
index 6beee69b6..a22146a79 100644
--- a/spec/controllers/account_types_controller_spec.rb
+++ b/spec/controllers/account_types_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AccountTypesController do
 
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 31ac5b014..eb2ff7f65 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AccountsController do
 
diff --git a/spec/controllers/admin/orders_controller_spec.rb b/spec/controllers/admin/orders_controller_spec.rb
index 090bbb68b..08dfb9933 100644
--- a/spec/controllers/admin/orders_controller_spec.rb
+++ b/spec/controllers/admin/orders_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Admin::OrdersController do
 
diff --git a/spec/controllers/admin_controller_spec.rb b/spec/controllers/admin_controller_spec.rb
index 76f56b78a..fc31f80b9 100644
--- a/spec/controllers/admin_controller_spec.rb
+++ b/spec/controllers/admin_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AdminController do
 
diff --git a/spec/controllers/authentications_controller_spec.rb b/spec/controllers/authentications_controller_spec.rb
index 8add74c8c..4fc5b98a5 100644
--- a/spec/controllers/authentications_controller_spec.rb
+++ b/spec/controllers/authentications_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AuthenticationsController do
 
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 6b830180a..0e10ffe42 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CommentsController do
 
diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb
index 997aa71a9..5cfe9f4d1 100644
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CropsController do
 
diff --git a/spec/controllers/forums_controller_spec.rb b/spec/controllers/forums_controller_spec.rb
index 324c46120..369919ff6 100644
--- a/spec/controllers/forums_controller_spec.rb
+++ b/spec/controllers/forums_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ForumsController do
 
diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb
index 242ec6ffa..2bba8a2f8 100644
--- a/spec/controllers/gardens_controller_spec.rb
+++ b/spec/controllers/gardens_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe GardensController do
 
diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb
index 38b0edf8c..efbaf4697 100644
--- a/spec/controllers/harvests_controller_spec.rb
+++ b/spec/controllers/harvests_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe HarvestsController do
 
@@ -105,9 +105,9 @@ describe HarvestsController do
         harvest = Harvest.create! valid_attributes
         # Assuming there are no other harvests in the database, this
         # specifies that the Harvest created on the previous line
-        # receives the :update_attributes message with whatever params are
+        # receives the :update message with whatever params are
         # submitted in the request.
-        Harvest.any_instance.should_receive(:update_attributes).with({ "crop_id" => "1" })
+        Harvest.any_instance.should_receive(:update).with({ "crop_id" => "1" })
         put :update, {:id => harvest.to_param, :harvest => { "crop_id" => "1" }}
       end
 
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index bfbfc6adf..da5edc384 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe HomeController do
 
diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb
index ff5a0ae42..35d5b0c6d 100644
--- a/spec/controllers/member_controller_spec.rb
+++ b/spec/controllers/member_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe MembersController do
 
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index 99add1cf4..d55b7df26 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe NotificationsController do
 
diff --git a/spec/controllers/order_items_controller_spec.rb b/spec/controllers/order_items_controller_spec.rb
index a33c55cc3..c8d23a4fd 100644
--- a/spec/controllers/order_items_controller_spec.rb
+++ b/spec/controllers/order_items_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe OrderItemsController do
 
diff --git a/spec/controllers/orders_controller_spec.rb b/spec/controllers/orders_controller_spec.rb
index 9fecc3695..d01f37f92 100644
--- a/spec/controllers/orders_controller_spec.rb
+++ b/spec/controllers/orders_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe OrdersController do
 
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index 1c3b47780..2dd7a6a56 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PhotosController do
 
diff --git a/spec/controllers/places_controller_spec.rb b/spec/controllers/places_controller_spec.rb
index 7d5841a6d..0c83c206a 100644
--- a/spec/controllers/places_controller_spec.rb
+++ b/spec/controllers/places_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PlacesController do
   before :each do
diff --git a/spec/controllers/plant_parts_controller_spec.rb b/spec/controllers/plant_parts_controller_spec.rb
index 9aefaa953..e813e0f38 100644
--- a/spec/controllers/plant_parts_controller_spec.rb
+++ b/spec/controllers/plant_parts_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PlantPartsController do
 
diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb
index 4b3a518a5..aa6fcbe4e 100644
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/spec/controllers/plantings_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PlantingsController do
 
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index bbb8bdccb..8121b318e 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PostsController do
 
diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index f2daad383..5804ad09d 100644
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ProductsController do
 
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 0ba0e29e6..8c0a669b4 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe RegistrationsController do
 
diff --git a/spec/controllers/roles_controller_spec.rb b/spec/controllers/roles_controller_spec.rb
index 0665101b4..f34bb79e3 100644
--- a/spec/controllers/roles_controller_spec.rb
+++ b/spec/controllers/roles_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe RolesController do
 
diff --git a/spec/controllers/scientific_names_controller_spec.rb b/spec/controllers/scientific_names_controller_spec.rb
index 254ebf1c8..45dd92066 100644
--- a/spec/controllers/scientific_names_controller_spec.rb
+++ b/spec/controllers/scientific_names_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScientificNamesController do
 
diff --git a/spec/controllers/seeds_controller_spec.rb b/spec/controllers/seeds_controller_spec.rb
index d41fe7c3b..7b0da6593 100644
--- a/spec/controllers/seeds_controller_spec.rb
+++ b/spec/controllers/seeds_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SeedsController do
   describe "GET index" do
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 2aaaa58ff..626757b52 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ShopController do
 
diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb
index dc4aa3b9c..d2f7ba262 100644
--- a/spec/factories/roles.rb
+++ b/spec/factories/roles.rb
@@ -4,7 +4,7 @@ FactoryGirl.define do
   factory :role do
     name "Moderator"
     description "These people moderate the forums"
-    initialize_with { Role.find_or_create_by_name(name) }
+    initialize_with { Role.find_or_create_by(name: name) }
 
     factory :admin do
       name "admin"
diff --git a/spec/features/admin/account_types_spec.rb b/spec/features/admin/account_types_spec.rb
index 2f8cda09f..b56144344 100644
--- a/spec/features/admin/account_types_spec.rb
+++ b/spec/features/admin/account_types_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "account types" do
   context "admin user" do
diff --git a/spec/features/admin/forums_spec.rb b/spec/features/admin/forums_spec.rb
index a5c6f4fb1..e9f8a43f9 100644
--- a/spec/features/admin/forums_spec.rb
+++ b/spec/features/admin/forums_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "forums" do
   context "admin user" do
diff --git a/spec/features/alternate_name_spec.rb b/spec/features/alternate_name_spec.rb
index 086584c40..8ec2a21fe 100644
--- a/spec/features/alternate_name_spec.rb
+++ b/spec/features/alternate_name_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Alternate names" do
   let!(:alternate_eggplant) { FactoryGirl.create(:alternate_eggplant) }
diff --git a/spec/features/crop_wranglers_spec.rb b/spec/features/crop_wranglers_spec.rb
index 32c96e639..b8d525a3f 100644
--- a/spec/features/crop_wranglers_spec.rb
+++ b/spec/features/crop_wranglers_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "crop wranglers" do
   context "signed in member" do
diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index a941cb075..a9740c131 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "crop detail page" do
 
diff --git a/spec/features/footer_spec.rb b/spec/features/footer_spec.rb
index aa8449b15..7187793c1 100644
--- a/spec/features/footer_spec.rb
+++ b/spec/features/footer_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "footer" do
   scenario "contact page has Twitter link" do
diff --git a/spec/features/gardens_spec.rb b/spec/features/gardens_spec.rb
index 5c689db44..8f311804e 100644
--- a/spec/features/gardens_spec.rb
+++ b/spec/features/gardens_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Planting a crop", :js => true do
   let!(:garden)   { FactoryGirl.create(:garden) }
diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb
index caffb237d..40c0eb8f8 100644
--- a/spec/features/harvests/harvesting_a_crop_spec.rb
+++ b/spec/features/harvests/harvesting_a_crop_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Harvesting a crop", :js => true do
   let(:member)   { FactoryGirl.create(:member) }
diff --git a/spec/features/locale_spec.rb b/spec/features/locale_spec.rb
index b5893858d..36b07b5c9 100644
--- a/spec/features/locale_spec.rb
+++ b/spec/features/locale_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Changing locales" do
 
diff --git a/spec/features/member_profile_spec.rb b/spec/features/member_profile_spec.rb
index 27c3c7619..8bcdd8bf0 100644
--- a/spec/features/member_profile_spec.rb
+++ b/spec/features/member_profile_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "member profile" do
 
diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb
index 5adb44095..3b8c88bf8 100644
--- a/spec/features/planting_reminder_spec.rb
+++ b/spec/features/planting_reminder_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'capybara/email/rspec'
 
 feature "Planting reminder email", :js => true do
diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb
index 82d180d84..16b47973f 100644
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 feature "Planting a crop", :js => true do
   let(:member)   { FactoryGirl.create(:member) }
diff --git a/spec/features/scientific_name_spec.rb b/spec/features/scientific_name_spec.rb
index 1fda79d42..c6cd60c6a 100644
--- a/spec/features/scientific_name_spec.rb
+++ b/spec/features/scientific_name_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Scientific names" do
   let!(:zea_mays) { FactoryGirl.create(:zea_mays) }
diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb
index ca79c5b8c..668771850 100644
--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/spec/features/seeds/adding_seeds_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Harvesting a crop", :js => true do
   let(:member)   { FactoryGirl.create(:member) }
diff --git a/spec/features/seeds/misc_seeds_spec.rb b/spec/features/seeds/misc_seeds_spec.rb
index 30c624e27..11f1d6c09 100644
--- a/spec/features/seeds/misc_seeds_spec.rb
+++ b/spec/features/seeds/misc_seeds_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "seeds" do
   context "signed in user" do
diff --git a/spec/features/shared_examples/append_date_spec.rb b/spec/features/shared_examples/append_date.rb
similarity index 100%
rename from spec/features/shared_examples/append_date_spec.rb
rename to spec/features/shared_examples/append_date.rb
diff --git a/spec/features/shared_examples/crop_suggest.rb b/spec/features/shared_examples/crop_suggest.rb
index da10072a3..141dfbabf 100644
--- a/spec/features/shared_examples/crop_suggest.rb
+++ b/spec/features/shared_examples/crop_suggest.rb
@@ -1,3 +1,5 @@
+require 'rails_helper'
+
 shared_examples "crop suggest" do |resource|
   let!(:popcorn) { FactoryGirl.create(:popcorn) }
   let!(:pear)    { FactoryGirl.create(:pear) }
diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb
index 3ad259213..dced5f2ac 100644
--- a/spec/features/signin_spec.rb
+++ b/spec/features/signin_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "signin" do
   let(:member){FactoryGirl.create(:member)}
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index 9962df359..aa4c9d65f 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "signup" do
 
@@ -11,7 +11,6 @@ feature "signup" do
     fill_in 'Password confirmation', with: 'abc123'
     check 'member_tos_agreement'
     click_button 'Sign up'
-    page.has_content? 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
     current_path.should eq root_path
   end
 
diff --git a/spec/helpers/application_helper.rb b/spec/helpers/application_helper.rb
index 912ffbfd5..9a39e59a7 100644
--- a/spec/helpers/application_helper.rb
+++ b/spec/helpers/application_helper.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ApplicationHelper do
   it "formats prices" do
diff --git a/spec/helpers/harvests_helper_spec.rb b/spec/helpers/harvests_helper_spec.rb
index ecc30a51e..7bc516162 100644
--- a/spec/helpers/harvests_helper_spec.rb
+++ b/spec/helpers/harvests_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe HarvestsHelper do
   describe "display_quantity" do
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 9db3a95aa..85f96d664 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe NotificationsHelper do
   describe "reply_link" do
diff --git a/spec/lib/haml/filters/escaped_markdown_spec.rb b/spec/lib/haml/filters/escaped_markdown_spec.rb
index 9e2c1ce1f..60066160f 100644
--- a/spec/lib/haml/filters/escaped_markdown_spec.rb
+++ b/spec/lib/haml/filters/escaped_markdown_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'haml/filters'
 require 'haml/filters/escaped_markdown'
 require 'haml/helpers'
diff --git a/spec/lib/haml/filters/growstuff_markdown_spec.rb b/spec/lib/haml/filters/growstuff_markdown_spec.rb
index 718645322..8abe8aee4 100644
--- a/spec/lib/haml/filters/growstuff_markdown_spec.rb
+++ b/spec/lib/haml/filters/growstuff_markdown_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'haml/filters'
 require 'haml/filters/growstuff_markdown'
 
diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb
index 6ade0fb78..4c7ac59a3 100644
--- a/spec/mailers/notifier_spec.rb
+++ b/spec/mailers/notifier_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Notifier do
 
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index 06ac61b7c..4eccf8916 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'cancan/matchers'
 
 describe Ability do
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8b2acd470..b1765ccc0 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Account do
   before(:each) do
diff --git a/spec/models/account_type_spec.rb b/spec/models/account_type_spec.rb
index 8dfe24bf7..c65c113ba 100644
--- a/spec/models/account_type_spec.rb
+++ b/spec/models/account_type_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AccountType do
 end
diff --git a/spec/models/alternate_name_spec.rb b/spec/models/alternate_name_spec.rb
index f7acd0efc..ecbdc10eb 100644
--- a/spec/models/alternate_name_spec.rb
+++ b/spec/models/alternate_name_spec.rb
@@ -1,10 +1,10 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AlternateName do
   let(:an) { FactoryGirl.create(:alternate_eggplant) }
 
   it 'should save a basic alternate name' do
-    expect(an.save).to be_true
+    expect(an.save).to be(true)
   end
 
   it 'should be possible to add multiple alternate names to a crop' do
diff --git a/spec/models/authentication_spec.rb b/spec/models/authentication_spec.rb
index 2a9df9aec..0159361ff 100644
--- a/spec/models/authentication_spec.rb
+++ b/spec/models/authentication_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Authentication do
 
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index d487d0b91..d54cd5606 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Comment do
 
diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb
index 5bd7d01ba..1850db459 100644
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Crop do
   context 'all fields present' do
@@ -8,7 +8,7 @@ describe Crop do
     end
 
     it 'should save a basic crop' do
-      @crop.save.should be_true
+      @crop.save.should be(true)
     end
 
     it 'should be fetchable from the database' do
diff --git a/spec/models/forum_spec.rb b/spec/models/forum_spec.rb
index 98ce1c24a..9769882c6 100644
--- a/spec/models/forum_spec.rb
+++ b/spec/models/forum_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Forum do
   before(:each) do
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index 9ed7e5196..9cc868d34 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Garden do
   before :each do
diff --git a/spec/models/harvest_spec.rb b/spec/models/harvest_spec.rb
index e1bc76ee7..504c8c414 100644
--- a/spec/models/harvest_spec.rb
+++ b/spec/models/harvest_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Harvest do
 
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 17f764453..9b0481298 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'member' do
 
@@ -33,11 +33,11 @@ describe 'member' do
 
     it "should have a default-type account by default" do
       @member.account.account_type.name.should eq Growstuff::Application.config.default_account_type
-      @member.is_paid?.should be_false
+      @member.is_paid?.should be(false)
     end
 
     it "doesn't show email by default" do
-      @member.show_email.should be_false
+      @member.show_email.should be(false)
     end
 
     it 'should stringify as the login_name' do
@@ -101,7 +101,7 @@ describe 'member' do
     end
 
     it "should refuse to save a member who hasn't agreed to the TOS" do
-      @member.save.should_not be_true
+      @member.save.should_not be(true)
     end
   end
 
@@ -311,7 +311,7 @@ describe 'member' do
       @account_type = FactoryGirl.create(:account_type,
           :is_paid => true, :is_permanent_paid => true)
       @member.account.account_type = @account_type
-      @member.is_paid?.should be_true
+      @member.is_paid?.should be(true)
     end
 
     it "recognises a current paid account" do
@@ -319,7 +319,7 @@ describe 'member' do
           :is_paid => true, :is_permanent_paid => false)
       @member.account.account_type = @account_type
       @member.account.paid_until = Time.zone.now + 1.month
-      @member.is_paid?.should be_true
+      @member.is_paid?.should be(true)
     end
 
     it "recognises an expired paid account" do
@@ -327,14 +327,14 @@ describe 'member' do
           :is_paid => true, :is_permanent_paid => false)
       @member.account.account_type = @account_type
       @member.account.paid_until = Time.zone.now - 1.minute
-      @member.is_paid?.should be_false
+      @member.is_paid?.should be(false)
     end
 
     it "recognises a free account" do
       @account_type = FactoryGirl.create(:account_type,
           :is_paid => false, :is_permanent_paid => false)
       @member.account.account_type = @account_type
-      @member.is_paid?.should be_false
+      @member.is_paid?.should be(false)
     end
 
     it "recognises a free account even with paid_until set" do
@@ -342,7 +342,7 @@ describe 'member' do
           :is_paid => false, :is_permanent_paid => false)
       @member.account.account_type = @account_type
       @member.account.paid_until = Time.zone.now + 1.month
-      @member.is_paid?.should be_false
+      @member.is_paid?.should be(false)
     end
 
   end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index a8bddb9fa..27924ebed 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Notification do
   before(:each) do
diff --git a/spec/models/order_item_spec.rb b/spec/models/order_item_spec.rb
index e12cc9fbf..20c0be94f 100644
--- a/spec/models/order_item_spec.rb
+++ b/spec/models/order_item_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe OrderItem do
   before(:each) do
diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb
index 60e98ac4d..50fb6f949 100644
--- a/spec/models/order_spec.rb
+++ b/spec/models/order_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Order do
   before(:each) do
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index f17127301..5a2099c7a 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Photo do
 
@@ -44,7 +44,7 @@ describe Photo do
         planting.photos << photo
         harvest.destroy # photo is now used by harvest but not planting
         photo.destroy_if_unused
-        expect(lambda { photo.reload }).not_to raise_error ActiveRecord::RecordNotFound
+        expect(lambda { photo.reload }).not_to raise_error
       end
 
       it 'they are used by harvests but not plantings' do
@@ -52,7 +52,7 @@ describe Photo do
         planting.photos << photo
         planting.destroy # photo is now used by harvest but not planting
         photo.destroy_if_unused
-        expect(lambda { photo.reload }).not_to raise_error ActiveRecord::RecordNotFound
+        expect(lambda { photo.reload }).not_to raise_error
       end
 
       it 'they are no longer used by anything' do
@@ -67,7 +67,7 @@ describe Photo do
         expect(photo.harvests.size).to eq 1
 
         harvest.destroy # photo is now no longer used by anything
-        photo.reload
+
         expect(photo.plantings.size).to eq 0
         expect(photo.harvests.size).to eq 0
         photo.destroy_if_unused
diff --git a/spec/models/plant_part_spec.rb b/spec/models/plant_part_spec.rb
index 45536afe4..f8dc1f290 100644
--- a/spec/models/plant_part_spec.rb
+++ b/spec/models/plant_part_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PlantPart do
   it 'stringifies' do
diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb
index 0f64a53f1..fba4fabe1 100644
--- a/spec/models/planting_spec.rb
+++ b/spec/models/planting_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Planting do
 
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 30c19c500..adce855d2 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Post do
   before(:each) do
diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb
index 59339a8c9..af1a02ba5 100644
--- a/spec/models/product_spec.rb
+++ b/spec/models/product_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Product do
 
diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb
index 5a74d6165..6ea5d1a9d 100644
--- a/spec/models/role_spec.rb
+++ b/spec/models/role_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Role do
   let(:member)  { FactoryGirl.create(:member) }
diff --git a/spec/models/scientific_name_spec.rb b/spec/models/scientific_name_spec.rb
index 496cf4dad..020f1cc0d 100644
--- a/spec/models/scientific_name_spec.rb
+++ b/spec/models/scientific_name_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScientificName do
   context 'all fields present' do
@@ -8,7 +8,7 @@ describe ScientificName do
     end
 
     it 'should save a basic scientific name' do
-      @sn.save.should be_true
+      @sn.save.should be(true)
     end
 
     it 'should be fetchable from the database' do
diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb
index 355edac10..cfd73bf04 100644
--- a/spec/models/seed_spec.rb
+++ b/spec/models/seed_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Seed do
 
@@ -7,7 +7,7 @@ describe Seed do
   end
 
   it 'should save a basic seed' do
-    @seed.save.should be_true
+    @seed.save.should be(true)
   end
 
   it "should have a slug" do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 000000000..9618ca895
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,85 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+require 'simplecov'
+require 'coveralls'
+
+# output coverage locally AND send it to coveralls
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+# fail if there's a significant test coverage drop
+SimpleCov.maximum_coverage_drop 1
+
+SimpleCov.start :rails do
+  add_filter 'spec/'
+  add_filter 'vendor/'
+end
+
+require 'capybara'
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
+Capybara.app_host = 'http://localhost'
+Capybara.server_port = 8080
+
+include Warden::Test::Helpers
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/features/shared_examples/**/*.rb")].each {|f| require f}
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = false
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # controller specs require this to work with Devise
+  # see https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
+  config.include Devise::TestHelpers, :type => :controller
+  config.extend ControllerMacros, :type => :controller
+end
diff --git a/spec/requests/authentications_spec.rb b/spec/requests/authentications_spec.rb
index f50942928..6cc612f44 100644
--- a/spec/requests/authentications_spec.rb
+++ b/spec/requests/authentications_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Authentications" do
   describe "GET /authentications" do
diff --git a/spec/requests/comments_spec.rb b/spec/requests/comments_spec.rb
index 7a38a46e8..c9b2ba9dc 100644
--- a/spec/requests/comments_spec.rb
+++ b/spec/requests/comments_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Comments" do
   describe "GET /comments" do
diff --git a/spec/requests/forums_spec.rb b/spec/requests/forums_spec.rb
index ee85dacfd..ff7cb283d 100644
--- a/spec/requests/forums_spec.rb
+++ b/spec/requests/forums_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Forums" do
   describe "GET /forums" do
diff --git a/spec/requests/gardens_spec.rb b/spec/requests/gardens_spec.rb
index bc8cd3ec2..91a8dc8b7 100644
--- a/spec/requests/gardens_spec.rb
+++ b/spec/requests/gardens_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Gardens" do
   describe "GET /gardens" do
diff --git a/spec/requests/harvests_spec.rb b/spec/requests/harvests_spec.rb
index edb408b0b..f3774b3c0 100644
--- a/spec/requests/harvests_spec.rb
+++ b/spec/requests/harvests_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Harvests" do
   describe "GET /harvests" do
diff --git a/spec/requests/notifications_spec.rb b/spec/requests/notifications_spec.rb
index 62031013e..85afbdd9f 100644
--- a/spec/requests/notifications_spec.rb
+++ b/spec/requests/notifications_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Notifications" do
   describe "GET /notifications" do
diff --git a/spec/requests/photos_spec.rb b/spec/requests/photos_spec.rb
index bfb595245..b937ded3d 100644
--- a/spec/requests/photos_spec.rb
+++ b/spec/requests/photos_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Photos" do
   describe "GET /photos" do
diff --git a/spec/requests/plant_parts_spec.rb b/spec/requests/plant_parts_spec.rb
index 4f607b22f..1fc2150b2 100644
--- a/spec/requests/plant_parts_spec.rb
+++ b/spec/requests/plant_parts_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "PlantParts" do
   describe "GET /plant_parts" do
diff --git a/spec/requests/plantings_spec.rb b/spec/requests/plantings_spec.rb
index cc5580f58..cb66922e0 100644
--- a/spec/requests/plantings_spec.rb
+++ b/spec/requests/plantings_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Plantings" do
   describe "GET /plantings" do
diff --git a/spec/requests/post_spec.rb b/spec/requests/post_spec.rb
index 5cfcf60bf..3bb479aa8 100644
--- a/spec/requests/post_spec.rb
+++ b/spec/requests/post_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Posts" do
   describe "GET /posts" do
diff --git a/spec/requests/scientific_names_spec.rb b/spec/requests/scientific_names_spec.rb
index 0b2d8dd5a..922f6f270 100644
--- a/spec/requests/scientific_names_spec.rb
+++ b/spec/requests/scientific_names_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "ScientificNames" do
   describe "GET /scientific_names" do
diff --git a/spec/requests/seeds_spec.rb b/spec/requests/seeds_spec.rb
index ac3ee1076..8bc5aeccf 100644
--- a/spec/requests/seeds_spec.rb
+++ b/spec/requests/seeds_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Seeds" do
   describe "GET /seeds" do
diff --git a/spec/routing/account_types_routing_spec.rb b/spec/routing/account_types_routing_spec.rb
index 456cedebe..440c16956 100644
--- a/spec/routing/account_types_routing_spec.rb
+++ b/spec/routing/account_types_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe AccountTypesController do
   describe "routing" do
diff --git a/spec/routing/authentications_routing_spec.rb b/spec/routing/authentications_routing_spec.rb
index 1a639dead..db574d686 100644
--- a/spec/routing/authentications_routing_spec.rb
+++ b/spec/routing/authentications_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe AuthenticationsController do
   describe "routing" do
diff --git a/spec/routing/comments_routing_spec.rb b/spec/routing/comments_routing_spec.rb
index 73c80563e..4a0fe8026 100644
--- a/spec/routing/comments_routing_spec.rb
+++ b/spec/routing/comments_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe CommentsController do
   describe "routing" do
diff --git a/spec/routing/crops_routing_spec.rb b/spec/routing/crops_routing_spec.rb
index 450ad30f3..1e1fe4aac 100644
--- a/spec/routing/crops_routing_spec.rb
+++ b/spec/routing/crops_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe CropsController do
   describe "routing" do
diff --git a/spec/routing/forums_routing_spec.rb b/spec/routing/forums_routing_spec.rb
index c783d5199..4bd7d6097 100644
--- a/spec/routing/forums_routing_spec.rb
+++ b/spec/routing/forums_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ForumsController do
   describe "routing" do
diff --git a/spec/routing/gardens_routing_spec.rb b/spec/routing/gardens_routing_spec.rb
index e3fbd6f31..1c627e091 100644
--- a/spec/routing/gardens_routing_spec.rb
+++ b/spec/routing/gardens_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe GardensController do
   describe "routing" do
diff --git a/spec/routing/harvests_routing_spec.rb b/spec/routing/harvests_routing_spec.rb
index 66ab7151e..8b34d920a 100644
--- a/spec/routing/harvests_routing_spec.rb
+++ b/spec/routing/harvests_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe HarvestsController do
   describe "routing" do
diff --git a/spec/routing/notifications_routing_spec.rb b/spec/routing/notifications_routing_spec.rb
index 421a443b3..35f54689f 100644
--- a/spec/routing/notifications_routing_spec.rb
+++ b/spec/routing/notifications_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe NotificationsController do
   describe "routing" do
diff --git a/spec/routing/order_items_routing_spec.rb b/spec/routing/order_items_routing_spec.rb
index 1993db17d..858a873ad 100644
--- a/spec/routing/order_items_routing_spec.rb
+++ b/spec/routing/order_items_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe OrderItemsController do
   describe "routing" do
diff --git a/spec/routing/orders_routing_spec.rb b/spec/routing/orders_routing_spec.rb
index 77e2c131d..7fc9735ee 100644
--- a/spec/routing/orders_routing_spec.rb
+++ b/spec/routing/orders_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe OrdersController do
   describe "routing" do
diff --git a/spec/routing/photos_routing_spec.rb b/spec/routing/photos_routing_spec.rb
index d7dc394ed..5bdfeca07 100644
--- a/spec/routing/photos_routing_spec.rb
+++ b/spec/routing/photos_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe PhotosController do
   describe "routing" do
diff --git a/spec/routing/plant_parts_routing_spec.rb b/spec/routing/plant_parts_routing_spec.rb
index 419b4a05e..54d02caa1 100644
--- a/spec/routing/plant_parts_routing_spec.rb
+++ b/spec/routing/plant_parts_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe PlantPartsController do
   describe "routing" do
diff --git a/spec/routing/plantings_routing_spec.rb b/spec/routing/plantings_routing_spec.rb
index 08fb24301..bf3e1e8b8 100644
--- a/spec/routing/plantings_routing_spec.rb
+++ b/spec/routing/plantings_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe PlantingsController do
   describe "routing" do
diff --git a/spec/routing/products_routing_spec.rb b/spec/routing/products_routing_spec.rb
index e50a77956..a9c2fa004 100644
--- a/spec/routing/products_routing_spec.rb
+++ b/spec/routing/products_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ProductsController do
   describe "routing" do
diff --git a/spec/routing/roles_routing_spec.rb b/spec/routing/roles_routing_spec.rb
index 4084a6e7e..0a7900f9d 100644
--- a/spec/routing/roles_routing_spec.rb
+++ b/spec/routing/roles_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe RolesController do
   describe "routing" do
diff --git a/spec/routing/scientific_names_routing_spec.rb b/spec/routing/scientific_names_routing_spec.rb
index c78d1ff7d..00c049289 100644
--- a/spec/routing/scientific_names_routing_spec.rb
+++ b/spec/routing/scientific_names_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ScientificNamesController do
   describe "routing" do
diff --git a/spec/routing/seeds_routing_spec.rb b/spec/routing/seeds_routing_spec.rb
index d4746d299..4fe46774a 100644
--- a/spec/routing/seeds_routing_spec.rb
+++ b/spec/routing/seeds_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe SeedsController do
   describe "routing" do
diff --git a/spec/routing/updates_routing_spec.rb b/spec/routing/updates_routing_spec.rb
index 0266d9686..9ff2b5ccd 100644
--- a/spec/routing/updates_routing_spec.rb
+++ b/spec/routing/updates_routing_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe PostsController do
   describe "routing" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f77c8b267..191e049ee 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,70 +1,87 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-
-require 'simplecov'
-require 'coveralls'
-
-# output coverage locally AND send it to coveralls
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-
-# fail if there's a significant test coverage drop
-SimpleCov.maximum_coverage_drop 1
-
-SimpleCov.start :rails do
-  add_filter 'spec/'
-  add_filter 'vendor/'
-end
-
-require 'capybara'
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-Capybara.app_host = 'http://localhost'
-Capybara.server_port = 8080
-
-include Warden::Test::Helpers
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-Dir[Rails.root.join("spec/features/shared_examples/**/*.rb")].each {|f| require f}
-
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.syntax = [:should, :expect]
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = false
+    mocks.syntax = [:should, :expect]
+  end
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = false
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
 
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 3
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 
-  # controller specs require this to work with Devise
-  # see https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
-  config.include Devise::TestHelpers, :type => :controller
-  config.extend ControllerMacros, :type => :controller
 end
diff --git a/spec/views/about/contact_spec.rb b/spec/views/about/contact_spec.rb
index 85d232126..f655a1394 100644
--- a/spec/views/about/contact_spec.rb
+++ b/spec/views/about/contact_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'about/contact.html.haml', :type => "view" do
   before(:each) do
@@ -7,6 +7,6 @@ describe 'about/contact.html.haml', :type => "view" do
 
   it 'should show support faq' do
     render
-    rendered.should contain 'General contact email'
+    rendered.should have_content 'General contact email'
   end
 end
diff --git a/spec/views/account_types/edit.html.haml_spec.rb b/spec/views/account_types/edit.html.haml_spec.rb
index bb5fbf433..cf77a0402 100644
--- a/spec/views/account_types/edit.html.haml_spec.rb
+++ b/spec/views/account_types/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "account_types/edit" do
   before(:each) do
diff --git a/spec/views/account_types/index.html.haml_spec.rb b/spec/views/account_types/index.html.haml_spec.rb
index cded5ef32..1bbd0dc72 100644
--- a/spec/views/account_types/index.html.haml_spec.rb
+++ b/spec/views/account_types/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "account_types/index" do
   before(:each) do
diff --git a/spec/views/account_types/new.html.haml_spec.rb b/spec/views/account_types/new.html.haml_spec.rb
index 3babc2fb9..a9e97ee54 100644
--- a/spec/views/account_types/new.html.haml_spec.rb
+++ b/spec/views/account_types/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "account_types/new" do
   before(:each) do
diff --git a/spec/views/account_types/show.html.haml_spec.rb b/spec/views/account_types/show.html.haml_spec.rb
index 941026cf4..bee9cebd5 100644
--- a/spec/views/account_types/show.html.haml_spec.rb
+++ b/spec/views/account_types/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "account_types/show" do
   before(:each) do
diff --git a/spec/views/accounts/edit.html.haml_spec.rb b/spec/views/accounts/edit.html.haml_spec.rb
index af3931dfa..124ec1d12 100644
--- a/spec/views/accounts/edit.html.haml_spec.rb
+++ b/spec/views/accounts/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accounts/edit" do
   before(:each) do
diff --git a/spec/views/accounts/index.html.haml_spec.rb b/spec/views/accounts/index.html.haml_spec.rb
index 56e76b0ff..e8c0f1a79 100644
--- a/spec/views/accounts/index.html.haml_spec.rb
+++ b/spec/views/accounts/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accounts/index" do
   before(:each) do
diff --git a/spec/views/accounts/new.html.haml_spec.rb b/spec/views/accounts/new.html.haml_spec.rb
index ab60cc346..3a2b7cdbc 100644
--- a/spec/views/accounts/new.html.haml_spec.rb
+++ b/spec/views/accounts/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accounts/new" do
   before(:each) do
diff --git a/spec/views/accounts/show.html.haml_spec.rb b/spec/views/accounts/show.html.haml_spec.rb
index 5b429e13e..13dfc3589 100644
--- a/spec/views/accounts/show.html.haml_spec.rb
+++ b/spec/views/accounts/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accounts/show" do
   before(:each) do
@@ -9,8 +9,8 @@ describe "accounts/show" do
   it "renders attributes in <p>" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should contain @account.member_id.to_s
-    rendered.should contain 'Free'
-    rendered.should contain @account.paid_until.to_s
+    rendered.should have_content @account.member_id.to_s
+    rendered.should have_content 'Free'
+    rendered.should have_content @account.paid_until.to_s
   end
 end
diff --git a/spec/views/admin/index_spec.rb b/spec/views/admin/index_spec.rb
index fe92a4193..eb9dd9d01 100644
--- a/spec/views/admin/index_spec.rb
+++ b/spec/views/admin/index_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'admin/index.html.haml', :type => "view" do
   before(:each) do
@@ -16,6 +16,6 @@ describe 'admin/index.html.haml', :type => "view" do
   end
 
   it "has a link to newsletter subscribers" do
-    rendered.should contain "Newsletter subscribers"
+    rendered.should have_content "Newsletter subscribers"
   end
 end
diff --git a/spec/views/admin/newsletter_spec.rb b/spec/views/admin/newsletter_spec.rb
index a0d871cd4..d072aee2e 100644
--- a/spec/views/admin/newsletter_spec.rb
+++ b/spec/views/admin/newsletter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'admin/newsletter.html.haml', :type => "view" do
   before(:each) do
@@ -11,6 +11,6 @@ describe 'admin/newsletter.html.haml', :type => "view" do
   end
 
   it "lists newsletter subscribers by email" do
-    rendered.should contain @subscriber.email
+    rendered.should have_content @subscriber.email
   end
 end
diff --git a/spec/views/admin/orders/index_spec.rb b/spec/views/admin/orders/index_spec.rb
index bc49a0028..e4279fdd0 100644
--- a/spec/views/admin/orders/index_spec.rb
+++ b/spec/views/admin/orders/index_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'admin/orders/index.html.haml', :type => "view" do
   before(:each) do
diff --git a/spec/views/authentications/index.html.haml_spec.rb b/spec/views/authentications/index.html.haml_spec.rb
index f780966ae..8fa3ba9b8 100644
--- a/spec/views/authentications/index.html.haml_spec.rb
+++ b/spec/views/authentications/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "authentications/index" do
   before(:each) do
diff --git a/spec/views/comments/edit.html.haml_spec.rb b/spec/views/comments/edit.html.haml_spec.rb
index beee78013..87ba9c549 100644
--- a/spec/views/comments/edit.html.haml_spec.rb
+++ b/spec/views/comments/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "comments/edit" do
   before(:each) do
diff --git a/spec/views/comments/index.html.haml_spec.rb b/spec/views/comments/index.html.haml_spec.rb
index 3cf270149..7161978ab 100644
--- a/spec/views/comments/index.html.haml_spec.rb
+++ b/spec/views/comments/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "comments/index" do
   before(:each) do
@@ -18,8 +18,8 @@ describe "comments/index" do
 
   it "renders a list of comments" do
     render
-    rendered.should contain 'OMG LOL'
-    rendered.should contain 'ROFL'
+    rendered.should have_content 'OMG LOL'
+    rendered.should have_content 'ROFL'
   end
 
   it "contains an RSS feed link" do
diff --git a/spec/views/comments/index.rss.haml_spec.rb b/spec/views/comments/index.rss.haml_spec.rb
index e5eeeac95..5278a8b56 100644
--- a/spec/views/comments/index.rss.haml_spec.rb
+++ b/spec/views/comments/index.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'comments/index.rss.haml' do
   before(:each) do
@@ -13,20 +13,20 @@ describe 'comments/index.rss.haml' do
   end
 
   it 'shows RSS feed title' do
-    rendered.should contain "Recent comments on all posts"
+    rendered.should have_content "Recent comments on all posts"
   end
 
   it 'shows item title' do
-    rendered.should contain "Comment by #{@author.login_name}"
+    rendered.should have_content "Comment by #{@author.login_name}"
   end
 
   it 'escapes html for link to post' do
     # it's then unescaped by 'render' so we don't actually look for &lt;
-    rendered.should contain '<a href='
+    rendered.should have_content '<a href='
   end
 
   it 'shows content of comments' do
-    rendered.should contain "OMG LOL"
+    rendered.should have_content "OMG LOL"
   end
 
 end
diff --git a/spec/views/comments/new.html.haml_spec.rb b/spec/views/comments/new.html.haml_spec.rb
index a27868a16..4df929a54 100644
--- a/spec/views/comments/new.html.haml_spec.rb
+++ b/spec/views/comments/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "comments/new" do
   before(:each) do
@@ -11,15 +11,15 @@ describe "comments/new" do
   end
 
   it "shows the text of the post under discussion" do
-    rendered.should contain @post.body
+    rendered.should have_content @post.body
   end
 
   it "shows previous comments" do
-    rendered.should contain @comment.body
+    rendered.should have_content @comment.body
   end
 
   it "shows the correct comment count" do
-    rendered.should contain "1 comment"
+    rendered.should have_content "1 comment"
   end
 
   it "renders new comment form" do
@@ -29,7 +29,7 @@ describe "comments/new" do
   end
 
   it 'shows markdown help' do
-    rendered.should contain 'Markdown'
+    rendered.should have_content 'Markdown'
   end
 
 end
diff --git a/spec/views/comments/show.html.haml_spec.rb b/spec/views/comments/show.html.haml_spec.rb
index 9c2af0496..7152a2715 100644
--- a/spec/views/comments/show.html.haml_spec.rb
+++ b/spec/views/comments/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "comments/show" do
   before(:each) do
@@ -8,7 +8,7 @@ describe "comments/show" do
   end
 
   it "renders the comment" do
-    rendered.should contain @comment.author.login_name
-    rendered.should contain @comment.body
+    rendered.should have_content @comment.author.login_name
+    rendered.should have_content @comment.body
   end
 end
diff --git a/spec/views/crops/_grown_for.html.haml_spec.rb b/spec/views/crops/_grown_for.html.haml_spec.rb
index 3950c1d32..88cf618e5 100644
--- a/spec/views/crops/_grown_for.html.haml_spec.rb
+++ b/spec/views/crops/_grown_for.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/_grown_for" do
   before(:each) do
@@ -12,7 +12,7 @@ describe "crops/_grown_for" do
 
   it 'shows plant parts' do
     render :partial => 'crops/grown_for', :locals => { :crop => @crop }
-    rendered.should contain @pp.name
+    rendered.should have_content @pp.name
     assert_select "a", :href => plant_part_path(@pp)
   end
 end
diff --git a/spec/views/crops/_planting_advice.html.haml_spec.rb b/spec/views/crops/_planting_advice.html.haml_spec.rb
index 19a756a7c..6c2a35481 100644
--- a/spec/views/crops/_planting_advice.html.haml_spec.rb
+++ b/spec/views/crops/_planting_advice.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/_planting_advice" do
   before(:each) do
@@ -14,14 +14,14 @@ describe "crops/_planting_advice" do
   context "sunniness" do
     it "doesn't show sunniness if none are set" do
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant in: not known."
+      rendered.should have_content "Plant in: not known."
     end
 
     it "shows sunniness frequencies" do
       FactoryGirl.create(:sunny_planting, :crop => @crop)
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant in:"
-      rendered.should contain "sun (1)"
+      rendered.should have_content "Plant in:"
+      rendered.should have_content "sun (1)"
     end
 
     it "shows multiple sunniness frequencies" do
@@ -29,8 +29,8 @@ describe "crops/_planting_advice" do
       FactoryGirl.create(:sunny_planting, :crop => @crop)
       FactoryGirl.create(:shady_planting, :crop => @crop)
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant in:"
-      rendered.should contain "sun (2), shade (1)"
+      rendered.should have_content "Plant in:"
+      rendered.should have_content "sun (2), shade (1)"
     end
 
   end
@@ -39,14 +39,14 @@ describe "crops/_planting_advice" do
 
     it "doesn't show planted_from if none are set" do
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant from: not known."
+      rendered.should have_content "Plant from: not known."
     end
 
     it "shows planted_from frequencies" do
       FactoryGirl.create(:seed_planting, :crop => @crop)
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant from:"
-      rendered.should contain "seed (1)"
+      rendered.should have_content "Plant from:"
+      rendered.should have_content "seed (1)"
     end
 
     it "shows multiple planted_from frequencies" do
@@ -54,8 +54,8 @@ describe "crops/_planting_advice" do
       FactoryGirl.create(:seed_planting, :crop => @crop)
       FactoryGirl.create(:cutting_planting, :crop => @crop)
       render :partial => 'crops/planting_advice', :locals => { :crop => @crop }
-      rendered.should contain "Plant from:"
-      rendered.should contain "seed (2), cutting (1)"
+      rendered.should have_content "Plant from:"
+      rendered.should have_content "seed (2), cutting (1)"
     end
   end
 
diff --git a/spec/views/crops/_popover.html.haml_spec.rb b/spec/views/crops/_popover.html.haml_spec.rb
index ad07f8ada..d503a7235 100644
--- a/spec/views/crops/_popover.html.haml_spec.rb
+++ b/spec/views/crops/_popover.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/_popover" do
   before(:each) do
@@ -10,11 +10,11 @@ describe "crops/_popover" do
   end
 
   it 'has a scientific name' do
-    rendered.should contain 'Solanum lycopersicum'
+    rendered.should have_content 'Solanum lycopersicum'
   end
 
   it 'shows count of plantings' do
-    rendered.should contain '1 time'
+    rendered.should have_content '1 time'
   end
 
 end
diff --git a/spec/views/crops/edit.html.haml_spec.rb b/spec/views/crops/edit.html.haml_spec.rb
index 3db9c52b0..031addb30 100644
--- a/spec/views/crops/edit.html.haml_spec.rb
+++ b/spec/views/crops/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/edit" do
   before(:each) do
@@ -14,7 +14,7 @@ describe "crops/edit" do
   end
 
   it "shows the creator" do
-    rendered.should contain "Added by #{@crop.creator} less than a minute ago."
+    rendered.should have_content "Added by #{@crop.creator} less than a minute ago."
   end
 
   it "renders the edit crop form" do
diff --git a/spec/views/crops/hierarchy.html.haml_spec.rb b/spec/views/crops/hierarchy.html.haml_spec.rb
index e5fbc7883..22b02d18f 100644
--- a/spec/views/crops/hierarchy.html.haml_spec.rb
+++ b/spec/views/crops/hierarchy.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/hierarchy" do
   before(:each) do
diff --git a/spec/views/crops/index.html.haml_spec.rb b/spec/views/crops/index.html.haml_spec.rb
index ca0ecc39b..69792ba76 100644
--- a/spec/views/crops/index.html.haml_spec.rb
+++ b/spec/views/crops/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/index" do
   before(:each) do
@@ -50,14 +50,14 @@ describe "crops/index" do
     end
 
     it "shows a new crop link" do
-      rendered.should contain "New Crop"
+      rendered.should have_content "New Crop"
     end
   end
 
   context "downloads" do
     it "offers data downloads" do
       render
-      rendered.should contain "The data on this page is available in the following formats:"
+      rendered.should have_content "The data on this page is available in the following formats:"
       assert_select "a", :href => crops_path(:format => 'csv')
       assert_select "a", :href => crops_path(:format => 'json')
       assert_select "a", :href => crops_path(:format => 'rss')
diff --git a/spec/views/crops/index.rss.haml_spec.rb b/spec/views/crops/index.rss.haml_spec.rb
index f0c5ac653..0e8887411 100644
--- a/spec/views/crops/index.rss.haml_spec.rb
+++ b/spec/views/crops/index.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'crops/index.rss.haml' do
   before(:each) do
@@ -11,12 +11,12 @@ describe 'crops/index.rss.haml' do
   end
 
   it 'shows RSS feed title' do
-    rendered.should contain "Recently added crops"
+    rendered.should have_content "Recently added crops"
   end
 
   it 'shows names of crops' do
-    rendered.should contain @tomato.name
-    rendered.should contain @maize.name
+    rendered.should have_content @tomato.name
+    rendered.should have_content @maize.name
   end
 
 end
diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb
index 0aa443f74..0c834d738 100644
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/new" do
   before(:each) do
diff --git a/spec/views/crops/search.html.haml_spec.rb b/spec/views/crops/search.html.haml_spec.rb
index c186c6c4c..82b6ea87c 100644
--- a/spec/views/crops/search.html.haml_spec.rb
+++ b/spec/views/crops/search.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/search" do
   before(:each) do
@@ -38,12 +38,12 @@ describe "crops/search" do
     end
 
     it "tells you there are no matches" do
-      rendered.should contain "No results found"
+      rendered.should have_content "No results found"
     end
 
     it "links to browse crops" do
       assert_select "a", :href => crops_path
-      rendered.should contain "Try browsing our crop database instead"
+      rendered.should have_content "Try browsing our crop database instead"
     end
   end
 
diff --git a/spec/views/crops/wrangle.html.haml_spec.rb b/spec/views/crops/wrangle.html.haml_spec.rb
index a4adde063..4426382d2 100644
--- a/spec/views/crops/wrangle.html.haml_spec.rb
+++ b/spec/views/crops/wrangle.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "crops/wrangle" do
   before(:each) do
@@ -18,8 +18,8 @@ describe "crops/wrangle" do
 
   it 'contains handy links for wranglers' do
     render
-    rendered.should contain "Crop wrangler guidelines"
-    rendered.should contain "mailing list"
+    rendered.should have_content "Crop wrangler guidelines"
+    rendered.should have_content "mailing list"
   end
 
   it 'has a link to add a crop' do
diff --git a/spec/views/devise/confirmations/new_spec.rb b/spec/views/devise/confirmations/new_spec.rb
index 1f4de467b..1e1555db3 100644
--- a/spec/views/devise/confirmations/new_spec.rb
+++ b/spec/views/devise/confirmations/new_spec.rb
@@ -9,6 +9,6 @@ describe 'devise/confirmations/new.html.haml', :type => "view" do
   end
 
   it 'should contain a login field' do
-    rendered.should contain "Enter either your login name or your email address"
+    rendered.should have_content "Enter either your login name or your email address"
   end
 end
diff --git a/spec/views/devise/mailer/confirmation_instructions_spec.rb b/spec/views/devise/mailer/confirmation_instructions_spec.rb
index 3a0921ae7..e42dd762c 100644
--- a/spec/views/devise/mailer/confirmation_instructions_spec.rb
+++ b/spec/views/devise/mailer/confirmation_instructions_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/mailer/confirmation_instructions.html.haml', :type => "view" do
 
@@ -9,11 +9,11 @@ describe 'devise/mailer/confirmation_instructions.html.haml', :type => "view" do
     end
 
     it 'should have a confirmation link' do
-      rendered.should contain 'Confirm my account'
+      rendered.should have_content 'Confirm my account'
     end
 
     it 'should have a link to the homepage' do
-      rendered.should contain root_url
+      rendered.should have_content root_url
     end
   end
 end
diff --git a/spec/views/devise/mailer/reset_password_instructions_spec.rb b/spec/views/devise/mailer/reset_password_instructions_spec.rb
index 4f19281a3..d75f69881 100644
--- a/spec/views/devise/mailer/reset_password_instructions_spec.rb
+++ b/spec/views/devise/mailer/reset_password_instructions_spec.rb
@@ -1,18 +1,18 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/mailer/reset_password_instructions.html.haml', :type => "view" do
 
   context "logged in" do
     before(:each) do
       @resource = mock_model(Member)
-      @resource.stub!(:email).and_return("example@example.com")
-      @resource.stub!(:reset_password_token).and_return("joe")
+      @resource.stub(:email).and_return("example@example.com")
+      @resource.stub(:reset_password_token).and_return("joe")
       render
     end
 
     it 'should have some of the right text' do
-      rendered.should contain 'Change my password'
-      rendered.should contain 'Someone has requested a link to reset your password'
+      rendered.should have_content 'Change my password'
+      rendered.should have_content 'Someone has requested a link to reset your password'
     end
   end
 end
diff --git a/spec/views/devise/mailer/unlock_instructions_spec.rb b/spec/views/devise/mailer/unlock_instructions_spec.rb
index 9cbca83a4..fd4c444f8 100644
--- a/spec/views/devise/mailer/unlock_instructions_spec.rb
+++ b/spec/views/devise/mailer/unlock_instructions_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 describe 'devise/mailer/unlock_instructions.html.haml', :type => "view" do
   context "logged in" do
     before(:each) do
@@ -7,11 +7,11 @@ describe 'devise/mailer/unlock_instructions.html.haml', :type => "view" do
     end
 
     it "should explain what's happened" do
-      rendered.should contain "account has been locked"
+      rendered.should have_content "account has been locked"
     end
 
     it "should have an unlock link" do
-      rendered.should contain "Unlock my account"
+      rendered.should have_content "Unlock my account"
     end
   end
 end
diff --git a/spec/views/devise/registrations/edit_spec.rb b/spec/views/devise/registrations/edit_spec.rb
index f9c48ec1a..c99b84aed 100644
--- a/spec/views/devise/registrations/edit_spec.rb
+++ b/spec/views/devise/registrations/edit_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/registrations/edit.html.haml', :type => "view" do
 
@@ -15,7 +15,7 @@ describe 'devise/registrations/edit.html.haml', :type => "view" do
 
     it 'should have some fields' do
       render
-      rendered.should contain 'Email'
+      rendered.should have_content 'Email'
     end
 
     context 'email section' do
diff --git a/spec/views/devise/registrations/new_spec.rb b/spec/views/devise/registrations/new_spec.rb
index b17b000b7..f7dcfffe1 100644
--- a/spec/views/devise/registrations/new_spec.rb
+++ b/spec/views/devise/registrations/new_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/registrations/new.html.haml', :type => "view" do
 
@@ -12,7 +12,7 @@ describe 'devise/registrations/new.html.haml', :type => "view" do
     end
 
     it 'should have some fields' do
-        rendered.should contain 'Email'
+        rendered.should have_content 'Email'
     end
 
     it 'has a checkbox for newsletter subscription' do
diff --git a/spec/views/devise/sessions/new_spec.rb b/spec/views/devise/sessions/new_spec.rb
index 9a178e63f..6d66e6a48 100644
--- a/spec/views/devise/sessions/new_spec.rb
+++ b/spec/views/devise/sessions/new_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/sessions/new.html.haml', :type => "view" do
 
@@ -12,8 +12,8 @@ describe 'devise/sessions/new.html.haml', :type => "view" do
     end
 
     it 'should have some fields' do
-        rendered.should contain 'Remember me'
-        rendered.should contain 'Password'
+        rendered.should have_content 'Remember me'
+        rendered.should have_content 'Password'
     end
   end
 end
diff --git a/spec/views/devise/shared/_links_spec.rb b/spec/views/devise/shared/_links_spec.rb
index b86715a46..41f9b45ef 100644
--- a/spec/views/devise/shared/_links_spec.rb
+++ b/spec/views/devise/shared/_links_spec.rb
@@ -1,7 +1,7 @@
 describe 'devise/shared/_links.haml', :type => "view" do
 
   def devise_mapping(register, recover, confirm, lock, oauth)
-    dm = mock("mappings")
+    dm = double("mappings")
     dm.stub(:registerable? => register)
     dm.stub(:recoverable? => recover)
     dm.stub(:confirmable? => confirm)
diff --git a/spec/views/devise/unlocks/new_spec.rb b/spec/views/devise/unlocks/new_spec.rb
index 0259691fe..fec998c4d 100644
--- a/spec/views/devise/unlocks/new_spec.rb
+++ b/spec/views/devise/unlocks/new_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'devise/unlocks/new.html.haml', :type => "view" do
 
@@ -12,7 +12,7 @@ describe 'devise/unlocks/new.html.haml', :type => "view" do
     end
 
     it 'should have some fields' do
-        rendered.should contain 'Email'
+        rendered.should have_content 'Email'
     end
   end
 end
diff --git a/spec/views/forums/edit.html.haml_spec.rb b/spec/views/forums/edit.html.haml_spec.rb
index 306f3bbf0..8a49b38be 100644
--- a/spec/views/forums/edit.html.haml_spec.rb
+++ b/spec/views/forums/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "forums/edit" do
   before(:each) do
diff --git a/spec/views/forums/index.html.haml_spec.rb b/spec/views/forums/index.html.haml_spec.rb
index d2046de48..a946c2407 100644
--- a/spec/views/forums/index.html.haml_spec.rb
+++ b/spec/views/forums/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "forums/index" do
   before(:each) do
@@ -28,8 +28,8 @@ describe "forums/index" do
 
     it "displays posts" do
       assert_select "table"
-      rendered.should contain @post.subject
-      rendered.should contain "less than a minute ago"
+      rendered.should have_content @post.subject
+      rendered.should have_content "less than a minute ago"
     end
 
     it "displays comment count" do
diff --git a/spec/views/forums/new.html.haml_spec.rb b/spec/views/forums/new.html.haml_spec.rb
index bfda7bfa1..86043eb8c 100644
--- a/spec/views/forums/new.html.haml_spec.rb
+++ b/spec/views/forums/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "forums/new" do
   before(:each) do
diff --git a/spec/views/forums/show.html.haml_spec.rb b/spec/views/forums/show.html.haml_spec.rb
index 735f5d482..45ff9aeed 100644
--- a/spec/views/forums/show.html.haml_spec.rb
+++ b/spec/views/forums/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "forums/show" do
   before(:each) do
@@ -8,8 +8,8 @@ describe "forums/show" do
 
   it "renders attributes" do
     render
-    rendered.should contain "Everything about permaculture"
-    rendered.should contain @forum.owner.to_s
+    rendered.should have_content "Everything about permaculture"
+    rendered.should have_content @forum.owner.to_s
   end
 
   it "parses markdown description into html" do
@@ -24,14 +24,14 @@ describe "forums/show" do
 
   it 'has no posts' do
     render
-    rendered.should contain "No posts yet."
+    rendered.should have_content "No posts yet."
   end
 
   it 'shows posts' do
     @post = FactoryGirl.create(:post, :forum => @forum)
     render
     assert_select "table"
-    rendered.should contain @post.subject
-    rendered.should contain @post.author.to_s
+    rendered.should have_content @post.subject
+    rendered.should have_content @post.author.to_s
   end
 end
diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb
index 781274c2c..e5381c324 100644
--- a/spec/views/gardens/edit.html.haml_spec.rb
+++ b/spec/views/gardens/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "gardens/edit" do
 
diff --git a/spec/views/gardens/index.html.haml_spec.rb b/spec/views/gardens/index.html.haml_spec.rb
index 123a75db9..a075822be 100644
--- a/spec/views/gardens/index.html.haml_spec.rb
+++ b/spec/views/gardens/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "gardens/index" do
   before(:each) do
diff --git a/spec/views/gardens/new.html.haml_spec.rb b/spec/views/gardens/new.html.haml_spec.rb
index 5e7d4c1e7..ff52f1f28 100644
--- a/spec/views/gardens/new.html.haml_spec.rb
+++ b/spec/views/gardens/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "gardens/new" do
   before(:each) do
diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb
index cd38a0ec4..6327073ee 100644
--- a/spec/views/gardens/show.html.haml_spec.rb
+++ b/spec/views/gardens/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "gardens/show" do
   before(:each) do
@@ -11,15 +11,15 @@ describe "gardens/show" do
   end
 
   it 'should show the location' do
-    rendered.should contain @garden.location
+    rendered.should have_content @garden.location
   end
 
   it 'should show the area' do
-    rendered.should contain pluralize(@garden.area, @garden.area_unit)
+    rendered.should have_content pluralize(@garden.area, @garden.area_unit)
   end
 
   it 'should show the description' do
-    rendered.should contain "totally cool garden"
+    rendered.should have_content "totally cool garden"
   end
 
   it 'renders markdown in the description' do
@@ -27,11 +27,11 @@ describe "gardens/show" do
   end
 
   it 'should show plantings on the garden page' do
-    rendered.should contain @planting.crop.name
+    rendered.should have_content @planting.crop.name
   end
 
   it "doesn't show the note about random plantings" do
-    rendered.should_not contain "Note: these are a random selection"
+    rendered.should_not have_content "Note: these are a random selection"
   end
 
   context 'signed in' do
@@ -42,11 +42,11 @@ describe "gardens/show" do
     end
 
     it 'should have an edit button' do
-      rendered.should contain 'Edit'
+      rendered.should have_content 'Edit'
     end
 
     it "shows a 'plant something' button" do
-      rendered.should contain "Plant something"
+      rendered.should have_content "Plant something"
     end
 
     it "links to the right crop in the planting link" do
diff --git a/spec/views/harvests/edit.html.haml_spec.rb b/spec/views/harvests/edit.html.haml_spec.rb
index e47d3ad4a..4802bab88 100644
--- a/spec/views/harvests/edit.html.haml_spec.rb
+++ b/spec/views/harvests/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "harvests/edit" do
   before(:each) do
diff --git a/spec/views/harvests/index.html.haml_spec.rb b/spec/views/harvests/index.html.haml_spec.rb
index 093a383a9..8751a5c41 100644
--- a/spec/views/harvests/index.html.haml_spec.rb
+++ b/spec/views/harvests/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "harvests/index" do
   before(:each) do
@@ -37,7 +37,7 @@ describe "harvests/index" do
 
   it "provides data links" do
     render
-    rendered.should contain "The data on this page is available in the following formats:"
+    rendered.should have_content "The data on this page is available in the following formats:"
     assert_select "a", :href => harvests_path(:format => 'csv')
     assert_select "a", :href => harvests_path(:format => 'json')
   end
@@ -45,13 +45,13 @@ describe "harvests/index" do
   it "displays member's name in title" do
     assign(:owner, @member)
     render
-    view.content_for(:title).should contain @member.login_name
+    view.content_for(:title).should have_content @member.login_name
   end
 
   it "displays crop's name in title" do
     assign(:crop, @tomato)
     render
-    view.content_for(:title).should contain @tomato.name
+    view.content_for(:title).should have_content @tomato.name
   end
 
 end
diff --git a/spec/views/harvests/new.html.haml_spec.rb b/spec/views/harvests/new.html.haml_spec.rb
index 81de2671a..93a595188 100644
--- a/spec/views/harvests/new.html.haml_spec.rb
+++ b/spec/views/harvests/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "harvests/new" do
   before(:each) do
diff --git a/spec/views/harvests/show.html.haml_spec.rb b/spec/views/harvests/show.html.haml_spec.rb
index f03706be8..7c897a684 100644
--- a/spec/views/harvests/show.html.haml_spec.rb
+++ b/spec/views/harvests/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "harvests/show" do
   before(:each) do
@@ -9,9 +9,9 @@ describe "harvests/show" do
   end
 
   it "renders attributes" do
-    rendered.should contain @crop.name
-    rendered.should contain @harvest.harvested_at.to_s
-    rendered.should contain @harvest.plant_part.to_s
+    rendered.should have_content @crop.name
+    rendered.should have_content @harvest.harvested_at.to_s
+    rendered.should have_content @harvest.plant_part.to_s
   end
 
 end
diff --git a/spec/views/home/_blurb.html.haml_spec.rb b/spec/views/home/_blurb.html.haml_spec.rb
index 3660d0900..285363e5e 100644
--- a/spec/views/home/_blurb.html.haml_spec.rb
+++ b/spec/views/home/_blurb.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_blurb.html.haml', :type => "view" do
   context 'signed out' do
@@ -8,7 +8,7 @@ describe 'home/_blurb.html.haml', :type => "view" do
     end
 
     it 'has description' do
-      rendered.should contain 'is a community of food gardeners'
+      rendered.should have_content 'is a community of food gardeners'
     end
 
     it 'has signup section' do
@@ -17,7 +17,7 @@ describe 'home/_blurb.html.haml', :type => "view" do
     end
 
     it 'has a link to sign in' do
-      rendered.should contain "Or sign in if you already have an account"
+      rendered.should have_content "Or sign in if you already have an account"
       assert_select "a", :href => new_member_session_path
     end
   end
diff --git a/spec/views/home/_crops.html.haml_spec.rb b/spec/views/home/_crops.html.haml_spec.rb
index b479f4ee4..548e0a375 100644
--- a/spec/views/home/_crops.html.haml_spec.rb
+++ b/spec/views/home/_crops.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_crops.html.haml', :type => "view" do
   before(:each) do
@@ -21,7 +21,7 @@ describe 'home/_crops.html.haml', :type => "view" do
 
   it 'shows plantings section' do
     assert_select 'h2', :text => 'Recently planted'
-    rendered.should contain @planting.location
+    rendered.should have_content @planting.location
   end
 
   it 'shows recently added crops' do
diff --git a/spec/views/home/_keep_in_touch.html.haml_spec.rb b/spec/views/home/_keep_in_touch.html.haml_spec.rb
index 3f12d4145..3438cab80 100644
--- a/spec/views/home/_keep_in_touch.html.haml_spec.rb
+++ b/spec/views/home/_keep_in_touch.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_keep_in_touch.html.haml', :type => "view" do
   before :each do
@@ -25,4 +25,4 @@ describe 'home/_keep_in_touch.html.haml', :type => "view" do
     assert_select 'a', :href => 'http://blog.growstuff.org/newsletter'
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/views/home/_members.html.haml_spec.rb b/spec/views/home/_members.html.haml_spec.rb
index 4b527f1a8..81f812a94 100644
--- a/spec/views/home/_members.html.haml_spec.rb
+++ b/spec/views/home/_members.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_members.html.haml', :type => "view" do
   before(:each) do
@@ -11,13 +11,13 @@ describe 'home/_members.html.haml', :type => "view" do
   end
 
   it 'Has a heading' do
-    rendered.should contain "Some of our members"
+    rendered.should have_content "Some of our members"
   end
 
   it 'Shows members' do
-    rendered.should contain @member.login_name
-    rendered.should contain @member.location
-    rendered.should contain @planting.crop_name
+    rendered.should have_content @member.login_name
+    rendered.should have_content @member.location
+    rendered.should have_content @planting.crop_name
   end
 
 end
diff --git a/spec/views/home/_open.html.haml_spec.rb b/spec/views/home/_open.html.haml_spec.rb
index 543db7630..49e541c3b 100644
--- a/spec/views/home/_open.html.haml_spec.rb
+++ b/spec/views/home/_open.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_open.html.haml', :type => "view" do
   before(:each) do
diff --git a/spec/views/home/_seeds.html.haml_spec.rb b/spec/views/home/_seeds.html.haml_spec.rb
index bc5f6d2fa..82efa194d 100644
--- a/spec/views/home/_seeds.html.haml_spec.rb
+++ b/spec/views/home/_seeds.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_seeds.html.haml', :type => "view" do
   before(:each) do
diff --git a/spec/views/home/_stats.html.haml_spec.rb b/spec/views/home/_stats.html.haml_spec.rb
index 0f39e9e81..b067e44f8 100644
--- a/spec/views/home/_stats.html.haml_spec.rb
+++ b/spec/views/home/_stats.html.haml_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/_stats.html.haml', :type => "view" do
   it 'has activity stats' do
     render
-    rendered.should contain "So far, 0 members have planted 0 crops"
+    rendered.should have_content "So far, 0 members have planted 0 crops"
   end
 end
diff --git a/spec/views/home/index_spec.rb b/spec/views/home/index_spec.rb
index 829c6fa36..fe651e149 100644
--- a/spec/views/home/index_spec.rb
+++ b/spec/views/home/index_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'home/index.html.haml', :type => "view" do
   before(:each) do
@@ -25,8 +25,8 @@ describe 'home/index.html.haml', :type => "view" do
     end
 
     it 'show interesting members' do
-      rendered.should contain @member.login_name
-      rendered.should contain @member.location
+      rendered.should have_content @member.login_name
+      rendered.should have_content @member.location
     end
   end
 
@@ -38,7 +38,7 @@ describe 'home/index.html.haml', :type => "view" do
     end
 
     it 'should say welcome' do
-      rendered.should contain "Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, #{@member.login_name}"
+      rendered.should have_content "Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, #{@member.login_name}"
     end
   end
 
diff --git a/spec/views/layouts/_footer_spec.rb b/spec/views/layouts/_footer_spec.rb
index c3dc3a9b7..00b1f1b07 100644
--- a/spec/views/layouts/_footer_spec.rb
+++ b/spec/views/layouts/_footer_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'layouts/_footer.html.haml', :type => "view" do
 
@@ -7,16 +7,16 @@ describe 'layouts/_footer.html.haml', :type => "view" do
     end
 
     it 'should have links in footer' do
-        rendered.should contain 'About'
-        rendered.should contain 'Contact'
+        rendered.should have_content 'About'
+        rendered.should have_content 'Contact'
         assert_select("a[href=/policy/tos]", 'Terms of Service')
         assert_select("a[href=/policy/privacy]", 'Privacy Policy')
         assert_select("a[href=/policy/community]", 'Community Guidelines')
-        rendered.should contain 'Open Source'
+        rendered.should have_content 'Open Source'
         assert_select("a[href=/support]", 'Support/FAQ')
     end
 
     it 'should not have an explicit wiki link' do
-        rendered.should_not contain 'Wiki'
+        rendered.should_not have_content 'Wiki'
     end
 end
diff --git a/spec/views/layouts/_header_spec.rb b/spec/views/layouts/_header_spec.rb
index 2274b25b5..f4ca3034a 100644
--- a/spec/views/layouts/_header_spec.rb
+++ b/spec/views/layouts/_header_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'layouts/_header.html.haml', :type => "view" do
   context "when not logged in" do
@@ -12,24 +12,24 @@ describe 'layouts/_header.html.haml', :type => "view" do
     end
 
     it 'should have signup/signin links' do
-      rendered.should contain 'Sign up'
-      rendered.should contain 'Sign in'
+      rendered.should have_content 'Sign up'
+      rendered.should have_content 'Sign in'
     end
 
     it 'has a Crops link' do
-      rendered.should contain "Crops"
+      rendered.should have_content "Crops"
     end
 
     it 'has a Seeds link' do
-      rendered.should contain "Seeds"
+      rendered.should have_content "Seeds"
     end
 
     it 'has a Places link' do
-      rendered.should contain "Community Map"
+      rendered.should have_content "Community Map"
     end
 
     it 'has a Community section' do
-      rendered.should contain "Community"
+      rendered.should have_content "Community"
     end
 
     it 'links to members' do
@@ -62,7 +62,7 @@ describe 'layouts/_header.html.haml', :type => "view" do
 
     context "your stuff" do
       it 'should have a Your Stuff section' do
-        rendered.should contain "Your Stuff"
+        rendered.should have_content "Your Stuff"
       end
       it "should show link to member's gardens" do
         assert_select("a[href=#{gardens_by_owner_path(:owner => @member.slug)}]", "Gardens")
@@ -79,11 +79,11 @@ describe 'layouts/_header.html.haml', :type => "view" do
     end
 
     it 'should show signout link' do
-      rendered.should contain 'Sign out'
+      rendered.should have_content 'Sign out'
     end
 
     it 'should show inbox link' do
-      rendered.should contain 'Inbox'
+      rendered.should have_content 'Inbox'
       rendered.should_not match(/Inbox \(\d+\)/)
     end
 
@@ -91,7 +91,7 @@ describe 'layouts/_header.html.haml', :type => "view" do
       it 'should show inbox count' do
         FactoryGirl.create(:notification, :recipient => @member)
         render
-        rendered.should contain 'Inbox (1)'
+        rendered.should have_content 'Inbox (1)'
       end
     end
 
diff --git a/spec/views/layouts/_meta_spec.rb b/spec/views/layouts/_meta_spec.rb
index a81942d0f..8419ea129 100644
--- a/spec/views/layouts/_meta_spec.rb
+++ b/spec/views/layouts/_meta_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'layouts/_meta.html.haml', :type => "view" do
   before(:each) do
diff --git a/spec/views/layouts/application_spec.rb b/spec/views/layouts/application_spec.rb
index 0c7bd8b50..45f1e7553 100644
--- a/spec/views/layouts/application_spec.rb
+++ b/spec/views/layouts/application_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'layouts/application.html.haml', :type => "view" do
   before(:each) do
@@ -9,7 +9,7 @@ describe 'layouts/application.html.haml', :type => "view" do
     Growstuff::Application.config.analytics_code = '<script>alert("foo!")</script>'
     render
     assert_select "script", :text => 'alert("foo!")'
-    rendered.should_not contain 'script'
+    rendered.should_not have_content 'script'
   end
 
 end
diff --git a/spec/views/members/_location.html.haml_spec.rb b/spec/views/members/_location.html.haml_spec.rb
index 96c1e3b8d..54c5d1198 100644
--- a/spec/views/members/_location.html.haml_spec.rb
+++ b/spec/views/members/_location.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "members/_location" do
   context "member with location" do
@@ -8,7 +8,7 @@ describe "members/_location" do
     end
 
     it 'shows location if available' do
-      rendered.should contain @member.location
+      rendered.should have_content @member.location
     end
 
     it "links to the places page" do
@@ -23,7 +23,7 @@ describe "members/_location" do
     end
 
     it 'shows unknown location' do
-      rendered.should contain "unknown location"
+      rendered.should have_content "unknown location"
     end
 
     it "doesn't link anywhere" do
diff --git a/spec/views/members/index.html.haml_spec.rb b/spec/views/members/index.html.haml_spec.rb
index 22fd9c04f..e9174ffd7 100644
--- a/spec/views/members/index.html.haml_spec.rb
+++ b/spec/views/members/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "members/index" do
   before(:each) do
@@ -19,7 +19,7 @@ describe "members/index" do
   end
 
   it 'contains member locations' do
-    rendered.should contain @member.location
+    rendered.should have_content @member.location
   end
 
 end
diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb
index df436b8af..e5619cdd6 100644
--- a/spec/views/members/show.rss.haml_spec.rb
+++ b/spec/views/members/show.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'members/show.rss.haml', :type => "view" do
   before(:each) do
@@ -10,21 +10,21 @@ describe 'members/show.rss.haml', :type => "view" do
   end
 
   it 'shows RSS feed title' do
-    rendered.should contain /member\d+'s recent posts/
+    rendered.should have_content /member\d+'s recent posts/
   end
 
   it 'shows content of posts' do
-    rendered.should contain "This is some text."
+    rendered.should have_content "This is some text."
   end
 
   it 'renders post bodies to HTML and XML-escapes them' do
 # The variable "rendered" has been entity-replaced and tag-stripped
 # The literal string output contains "&lt;strong&gt;" etc.
-    rendered.should contain "<strong>strong</strong>"
+    rendered.should have_content "<strong>strong</strong>"
   end
 
   it 'gives the author in the item title' do
-    rendered.should contain "#{@post1.subject} by #{@post1.author}"
+    rendered.should have_content "#{@post1.subject} by #{@post1.author}"
   end
 
 end
diff --git a/spec/views/notifications/index.html.haml_spec.rb b/spec/views/notifications/index.html.haml_spec.rb
index 351bbb44f..43fd80ede 100644
--- a/spec/views/notifications/index.html.haml_spec.rb
+++ b/spec/views/notifications/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "notifications/index" do
   before(:each) do
@@ -31,7 +31,7 @@ describe "notifications/index" do
          :sender => @member, :recipient => @member, :subject => nil)
       assign(:notifications, [@notification])
       render
-      rendered.should contain "(no subject)"
+      rendered.should have_content "(no subject)"
     end
   end
 
@@ -41,7 +41,7 @@ describe "notifications/index" do
          :sender => @member, :recipient => @member, :subject => "   ")
       assign(:notifications, [@notification])
       render
-      rendered.should contain "(no subject)"
+      rendered.should have_content "(no subject)"
     end
   end
 
diff --git a/spec/views/notifications/new.html.haml_spec.rb b/spec/views/notifications/new.html.haml_spec.rb
index d96358da8..8b77f6422 100644
--- a/spec/views/notifications/new.html.haml_spec.rb
+++ b/spec/views/notifications/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "notifications/new" do
   before(:each) do
@@ -19,7 +19,7 @@ describe "notifications/new" do
 
   it "tells you who the recipient is" do
     render
-    rendered.should contain @recipient.login_name
+    rendered.should have_content @recipient.login_name
   end
 
   it "puts the recipient in a hidden field" do
@@ -40,12 +40,12 @@ describe "notifications/new" do
 
   it "Tells you to write your message here" do
     render
-    rendered.should contain "Type your message here"
+    rendered.should have_content "Type your message here"
   end
 
   it 'shows markdown help' do
     render
-    rendered.should contain 'Markdown'
+    rendered.should have_content 'Markdown'
   end
 
 end
diff --git a/spec/views/notifications/show.html.haml_spec.rb b/spec/views/notifications/show.html.haml_spec.rb
index 3028e8f0e..cc33a07e4 100644
--- a/spec/views/notifications/show.html.haml_spec.rb
+++ b/spec/views/notifications/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "notifications/show" do
   before(:each) do
@@ -11,8 +11,8 @@ describe "notifications/show" do
   end
 
   it "renders attributes" do
-    rendered.should contain @notification.sender.to_s
-    rendered.should contain @notification.body.to_s
+    rendered.should have_content @notification.sender.to_s
+    rendered.should have_content @notification.body.to_s
   end
 
   it "includes a delete button" do
diff --git a/spec/views/notifier/notify.html.haml_spec.rb b/spec/views/notifier/notify.html.haml_spec.rb
index 687e702cc..b5740b548 100644
--- a/spec/views/notifier/notify.html.haml_spec.rb
+++ b/spec/views/notifier/notify.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'notifier/notify.html.haml', :type => "view" do
 
@@ -10,12 +10,12 @@ describe 'notifier/notify.html.haml', :type => "view" do
   end
 
   it 'should say that you have a message' do
-    rendered.should contain 'You have received a message'
+    rendered.should have_content 'You have received a message'
   end
 
   it 'should include notification metadata' do
-    rendered.should contain @notification.sender.login_name
-    rendered.should contain @notification.post.subject
+    rendered.should have_content @notification.sender.login_name
+    rendered.should have_content @notification.post.subject
   end
 
   it 'should include a reply link' do
diff --git a/spec/views/orders/index.html.haml_spec.rb b/spec/views/orders/index.html.haml_spec.rb
index 2eb399abd..ad2116df7 100644
--- a/spec/views/orders/index.html.haml_spec.rb
+++ b/spec/views/orders/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "orders/index" do
   before(:each) do
@@ -11,7 +11,7 @@ describe "orders/index" do
 
   it "shows your current account status" do
     render
-    rendered.should contain "Your current account status"
+    rendered.should have_content "Your current account status"
   end
 
   it "renders a list of orders" do
diff --git a/spec/views/orders/show.html.haml_spec.rb b/spec/views/orders/show.html.haml_spec.rb
index 9621de369..98d0eb5e0 100644
--- a/spec/views/orders/show.html.haml_spec.rb
+++ b/spec/views/orders/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "orders/show" do
 
@@ -20,7 +20,7 @@ describe "orders/show" do
     end
 
     it "displays order number" do
-      rendered.should contain "Order number"
+      rendered.should have_content "Order number"
     end
 
     it "shows order items in a table" do
@@ -28,7 +28,7 @@ describe "orders/show" do
     end
 
     it "shows the total" do
-      rendered.should contain "Total:"
+      rendered.should have_content "Total:"
       assert_select "strong", /198.00/
     end
 
diff --git a/spec/views/photos/edit.html.haml_spec.rb b/spec/views/photos/edit.html.haml_spec.rb
index 3b8cde557..f3a9a0ed7 100644
--- a/spec/views/photos/edit.html.haml_spec.rb
+++ b/spec/views/photos/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "photos/edit" do
   before(:each) do
diff --git a/spec/views/photos/index.html.haml_spec.rb b/spec/views/photos/index.html.haml_spec.rb
index bf4699c48..5daaa1eda 100644
--- a/spec/views/photos/index.html.haml_spec.rb
+++ b/spec/views/photos/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "photos/index" do
   before(:each) do
diff --git a/spec/views/photos/new.html.haml_spec.rb b/spec/views/photos/new.html.haml_spec.rb
index c3e47a6b8..8f0f241e3 100644
--- a/spec/views/photos/new.html.haml_spec.rb
+++ b/spec/views/photos/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "photos/new" do
   before(:each) do
diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb
index 18a201590..5ef9dc9c0 100644
--- a/spec/views/photos/show.html.haml_spec.rb
+++ b/spec/views/photos/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "photos/show" do
   before(:each) do
@@ -41,7 +41,7 @@ describe "photos/show" do
     end
 
     it "contains the phrase 'All rights reserved'" do
-      rendered.should contain "All rights reserved"
+      rendered.should have_content "All rights reserved"
     end
 
   end
diff --git a/spec/views/places/_map_attribution.html.haml_spec.rb b/spec/views/places/_map_attribution.html.haml_spec.rb
index e3197dfba..d85875376 100644
--- a/spec/views/places/_map_attribution.html.haml_spec.rb
+++ b/spec/views/places/_map_attribution.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "places/_map_attribution.html.haml", :type => :view do
   before(:each) do
diff --git a/spec/views/places/index.html.haml_spec.rb b/spec/views/places/index.html.haml_spec.rb
index 0e4af0bb1..f3a3661ae 100644
--- a/spec/views/places/index.html.haml_spec.rb
+++ b/spec/views/places/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "places/index" do
   before(:each) do
diff --git a/spec/views/places/show.html.haml_spec.rb b/spec/views/places/show.html.haml_spec.rb
index 987212740..8e3e346c5 100644
--- a/spec/views/places/show.html.haml_spec.rb
+++ b/spec/views/places/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "places/show" do
   before(:each) do
@@ -20,7 +20,7 @@ describe "places/show" do
 
   it "shows the names of nearby members" do
     @nearby_members.each do |m|
-      rendered.should contain m.login_name
+      rendered.should have_content m.login_name
     end
   end
 
diff --git a/spec/views/plant_parts/edit.html.haml_spec.rb b/spec/views/plant_parts/edit.html.haml_spec.rb
index 2011b34c3..6193ef1b0 100644
--- a/spec/views/plant_parts/edit.html.haml_spec.rb
+++ b/spec/views/plant_parts/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plant_parts/edit" do
   before(:each) do
diff --git a/spec/views/plant_parts/index.html.haml_spec.rb b/spec/views/plant_parts/index.html.haml_spec.rb
index 6d1020717..1a9469c55 100644
--- a/spec/views/plant_parts/index.html.haml_spec.rb
+++ b/spec/views/plant_parts/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plant_parts/index" do
   before(:each) do
@@ -9,7 +9,7 @@ describe "plant_parts/index" do
 
   it "renders a list of plant_parts" do
     render
-    rendered.should contain @pp.name
+    rendered.should have_content @pp.name
     assert_select "a", :href => plant_part_path(@pp)
   end
 
diff --git a/spec/views/plant_parts/new.html.haml_spec.rb b/spec/views/plant_parts/new.html.haml_spec.rb
index 6a415fd4e..d512ecee1 100644
--- a/spec/views/plant_parts/new.html.haml_spec.rb
+++ b/spec/views/plant_parts/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plant_parts/new" do
   before(:each) do
diff --git a/spec/views/plant_parts/show.html.haml_spec.rb b/spec/views/plant_parts/show.html.haml_spec.rb
index 40392a65d..b65ecb154 100644
--- a/spec/views/plant_parts/show.html.haml_spec.rb
+++ b/spec/views/plant_parts/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plant_parts/show" do
   before(:each) do
@@ -11,7 +11,7 @@ describe "plant_parts/show" do
   it "renders a list of crops harvested for this part" do
     render
     @pp.crops.each do |c|
-      rendered.should contain c.name
+      rendered.should have_content c.name
       assert_select "a", :href => crop_path(c)
     end
   end
diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb
index 69da79c35..88b12bd9e 100644
--- a/spec/views/plantings/_form.html.haml_spec.rb
+++ b/spec/views/plantings/_form.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/_form" do
   before(:each) do
diff --git a/spec/views/plantings/_thumbnail.html.haml_spec.rb b/spec/views/plantings/_thumbnail.html.haml_spec.rb
index ac1ffaa78..dd5cc2003 100644
--- a/spec/views/plantings/_thumbnail.html.haml_spec.rb
+++ b/spec/views/plantings/_thumbnail.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/_thumbnail" do
   before(:each) do
@@ -21,19 +21,19 @@ describe "plantings/_thumbnail" do
     end
 
     it "renders the quantity planted" do
-      rendered.should contain "33"
+      rendered.should have_content "33"
     end
 
     it "renders the date planted" do
-      rendered.should contain @planting.planted_at.to_s(:default)
+      rendered.should have_content @planting.planted_at.to_s(:default)
     end
 
     it "shows the name of the crop" do
-      rendered.should contain @crop.name
+      rendered.should have_content @crop.name
     end
 
     it "shows the description by default" do
-      rendered.should contain "This is a"
+      rendered.should have_content "This is a"
     end
   end
 
@@ -46,7 +46,7 @@ describe "plantings/_thumbnail" do
     end
 
     it "hides the description if asked" do
-      rendered.should_not contain "This is a"
+      rendered.should_not have_content "This is a"
     end
   end
 
diff --git a/spec/views/plantings/edit.html.haml_spec.rb b/spec/views/plantings/edit.html.haml_spec.rb
index f80f6a0b4..4cc06fcdc 100644
--- a/spec/views/plantings/edit.html.haml_spec.rb
+++ b/spec/views/plantings/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/edit" do
   before(:each) do
@@ -49,7 +49,7 @@ describe "plantings/edit" do
 
     it "chooses the right garden" do
       assert_select "select#planting_garden_id",
-        :html => /option value="#{@garden.id}" selected="selected"/
+        :html => /option selected="selected" value="#{@garden.id}"/
     end
 
   end
diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb
index f80331117..6a130c8c9 100644
--- a/spec/views/plantings/index.html.haml_spec.rb
+++ b/spec/views/plantings/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/index" do
   before(:each) do
@@ -37,23 +37,23 @@ describe "plantings/index" do
   end
 
   it "renders a list of plantings" do
-    rendered.should contain @tomato.name
-    rendered.should contain @maize.name
-    rendered.should contain @member.login_name
-    rendered.should contain @garden.name
+    rendered.should have_content @tomato.name
+    rendered.should have_content @maize.name
+    rendered.should have_content @member.login_name
+    rendered.should have_content @garden.name
   end
 
   it "displays planting time" do
-    rendered.should contain 'January 13, 2013'
+    rendered.should have_content 'January 13, 2013'
   end
 
   it "displays finished time" do
-    rendered.should contain 'January 20, 2013'
+    rendered.should have_content 'January 20, 2013'
   end
 
   it "provides data links" do
     render
-    rendered.should contain "The data on this page is available in the following formats:"
+    rendered.should have_content "The data on this page is available in the following formats:"
     assert_select "a", :href => plantings_path(:format => 'csv')
     assert_select "a", :href => plantings_path(:format => 'json')
     assert_select "a", :href => plantings_path(:format => 'rss')
@@ -62,12 +62,12 @@ describe "plantings/index" do
   it "displays member's name in title" do
     assign(:owner, @member)
     render
-    view.content_for(:title).should contain @member.login_name
+    view.content_for(:title).should have_content @member.login_name
   end
 
   it "displays crop's name in title" do
     assign(:crop, @tomato)
     render
-    view.content_for(:title).should contain @tomato.name
+    view.content_for(:title).should have_content @tomato.name
   end
 end
diff --git a/spec/views/plantings/index.rss.haml_spec.rb b/spec/views/plantings/index.rss.haml_spec.rb
index 5a7cb48c5..c953382ce 100644
--- a/spec/views/plantings/index.rss.haml_spec.rb
+++ b/spec/views/plantings/index.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'plantings/index.rss.haml' do
   before(:each) do
@@ -15,23 +15,23 @@ describe 'plantings/index.rss.haml' do
     end
 
     it 'shows RSS feed title' do
-      rendered.should contain "Recent plantings from all members"
+      rendered.should have_content "Recent plantings from all members"
     end
 
     it 'item title shows owner and location' do
-      rendered.should contain "#{@planting.crop} in #{@planting.location}"
+      rendered.should have_content "#{@planting.crop} in #{@planting.location}"
     end
 
     it 'shows formatted content of posts' do
-      rendered.should contain "This is a <em>really</em> good plant."
+      rendered.should have_content "This is a <em>really</em> good plant."
     end
 
     it 'shows sunniness' do
-      rendered.should contain 'Sunniness: sun'
+      rendered.should have_content 'Sunniness: sun'
     end
 
     it 'shows propagation method' do
-      rendered.should contain 'Planted from: seedling'
+      rendered.should have_content 'Planted from: seedling'
     end
   end
 
@@ -44,7 +44,7 @@ describe 'plantings/index.rss.haml' do
     end
 
     it 'shows title for single member' do
-      rendered.should contain "Recent plantings from #{@planting.owner}"
+      rendered.should have_content "Recent plantings from #{@planting.owner}"
     end
   end
 end
diff --git a/spec/views/plantings/new.html.haml_spec.rb b/spec/views/plantings/new.html.haml_spec.rb
index 61e81eb20..455b9a411 100644
--- a/spec/views/plantings/new.html.haml_spec.rb
+++ b/spec/views/plantings/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/new" do
   before(:each) do
@@ -46,7 +46,7 @@ describe "plantings/new" do
 
     it "selects a garden given in a param" do
       assert_select "select#planting_garden_id",
-        :html => /option value="#{@garden_z.id}" selected="selected"/
+        :html => /option selected="selected" value="#{@garden_z.id}"/
     end
   end
 end
diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb
index 018e5074b..28a44078a 100644
--- a/spec/views/plantings/show.html.haml_spec.rb
+++ b/spec/views/plantings/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "plantings/show" do
   def create_planting_for(member)
@@ -25,16 +25,16 @@ describe "plantings/show" do
 
     it "shows the sunniness" do
       render
-      rendered.should contain 'Sun or shade?'
-      rendered.should contain 'sun'
+      rendered.should have_content 'Sun or shade?'
+      rendered.should have_content 'sun'
     end
 
     it "doesn't show sunniness if blank" do
       @p.sunniness = ''
       @p.save
       render
-      rendered.should_not contain 'Sun or shade?'
-      rendered.should_not contain 'sun'
+      rendered.should_not have_content 'Sun or shade?'
+      rendered.should_not have_content 'sun'
     end
   end
 
@@ -45,16 +45,16 @@ describe "plantings/show" do
 
     it "shows planted_from" do
       render
-      rendered.should contain 'Planted from:'
-      rendered.should contain 'cutting'
+      rendered.should have_content 'Planted from:'
+      rendered.should have_content 'cutting'
     end
 
     it "doesn't show planted_from if blank" do
       @p.planted_from = ''
       @p.save
       render
-      rendered.should_not contain 'Planted from:'
-      rendered.should_not contain 'cutting'
+      rendered.should_not have_content 'Planted from:'
+      rendered.should_not have_content 'cutting'
     end
   end
 
@@ -67,7 +67,7 @@ describe "plantings/show" do
 
   it "shows a link to add photos" do
     render
-    rendered.should contain "Add photo"
+    rendered.should have_content "Add photo"
   end
 
   context "no location set" do
@@ -88,7 +88,7 @@ describe "plantings/show" do
     end
 
     it "doesn't contain a () if no location is set" do
-      rendered.should_not contain "()"
+      rendered.should_not have_content "()"
     end
   end
 
@@ -100,7 +100,7 @@ describe "plantings/show" do
     end
 
     it "shows the member's location in parentheses" do
-      rendered.should contain "(#{@p.owner.location})"
+      rendered.should have_content "(#{@p.owner.location})"
     end
   end
 end
diff --git a/spec/views/policy/community_spec.rb b/spec/views/policy/community_spec.rb
index 70608e463..17f6d3b11 100644
--- a/spec/views/policy/community_spec.rb
+++ b/spec/views/policy/community_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'policy/community.html.haml', :type => "view" do
   before(:each) do
@@ -7,6 +7,6 @@ describe 'policy/community.html.haml', :type => "view" do
 
   it 'should show community guidelines' do
     render
-    rendered.should contain 'is a community by and for food-gardeners.'
+    rendered.should have_content 'is a community by and for food-gardeners.'
   end
 end
diff --git a/spec/views/policy/tos_spec.rb b/spec/views/policy/tos_spec.rb
index 548deadc3..24cacdf0d 100644
--- a/spec/views/policy/tos_spec.rb
+++ b/spec/views/policy/tos_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'policy/tos.html.haml', :type => "view" do
   before(:each) do
@@ -7,6 +7,6 @@ describe 'policy/tos.html.haml', :type => "view" do
 
   it 'should show terms of service' do
     render
-    rendered.should contain 'Terms of Service'
+    rendered.should have_content 'Terms of Service'
   end
 end
diff --git a/spec/views/posts/_single.html.haml_spec.rb b/spec/views/posts/_single.html.haml_spec.rb
index eebac11f4..268db854d 100644
--- a/spec/views/posts/_single.html.haml_spec.rb
+++ b/spec/views/posts/_single.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "posts/_single" do
 
@@ -101,7 +101,7 @@ describe "posts/_single" do
     end
 
     it "renders no value of comments" do
-      rendered.should_not contain "1 comment"
+      rendered.should_not have_content "1 comment"
     end
 
     it "does not contain link to post" do
diff --git a/spec/views/posts/edit.html.haml_spec.rb b/spec/views/posts/edit.html.haml_spec.rb
index 91e2d9b4f..7b3f0b195 100644
--- a/spec/views/posts/edit.html.haml_spec.rb
+++ b/spec/views/posts/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "posts/edit" do
   before(:each) do
@@ -25,7 +25,7 @@ describe "posts/edit" do
     end
 
     it 'no forum mentioned' do
-      rendered.should_not contain "This post will be posted in the forum"
+      rendered.should_not have_content "This post will be posted in the forum"
     end
 
     context "forum specified" do
@@ -43,7 +43,7 @@ describe "posts/edit" do
       end
 
       it 'tells the user what forum it will be posted in' do
-        rendered.should contain "This post will be posted in the forum #{@forum.name}"
+        rendered.should have_content "This post will be posted in the forum #{@forum.name}"
       end
     end
 
diff --git a/spec/views/posts/index.html.haml_spec.rb b/spec/views/posts/index.html.haml_spec.rb
index 3b7b02611..d5d49951a 100644
--- a/spec/views/posts/index.html.haml_spec.rb
+++ b/spec/views/posts/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "posts/index" do
   before(:each) do
diff --git a/spec/views/posts/index.rss.haml_spec.rb b/spec/views/posts/index.rss.haml_spec.rb
index b28deb2db..0a303f19b 100644
--- a/spec/views/posts/index.rss.haml_spec.rb
+++ b/spec/views/posts/index.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'posts/index.rss.haml', :type => "view" do
   before(:each) do
@@ -11,15 +11,15 @@ describe 'posts/index.rss.haml', :type => "view" do
   end
 
   it 'shows RSS feed title' do
-    rendered.should contain "Recent posts from all members"
+    rendered.should have_content "Recent posts from all members"
   end
 
   it 'shows content of posts' do
-    rendered.should contain "This is some text."
+    rendered.should have_content "This is some text."
   end
 
   it 'gives the author in the item title' do
-    rendered.should contain "#{@post1.subject} by #{@post1.author}"
+    rendered.should have_content "#{@post1.subject} by #{@post1.author}"
   end
 
 end
diff --git a/spec/views/posts/new.html.haml_spec.rb b/spec/views/posts/new.html.haml_spec.rb
index be69c972c..73448e24c 100644
--- a/spec/views/posts/new.html.haml_spec.rb
+++ b/spec/views/posts/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "posts/new" do
   before(:each) do
@@ -24,12 +24,12 @@ describe "posts/new" do
 
   it 'no forum mentioned' do
     render
-    rendered.should_not contain "This post will be posted in the forum"
+    rendered.should_not have_content "This post will be posted in the forum"
   end
 
   it "asks what's going on in your garden" do
     render
-    rendered.should contain "What's going on in your food garden?"
+    rendered.should have_content "What's going on in your food garden?"
   end
 
   context "forum specified" do
@@ -44,19 +44,19 @@ describe "posts/new" do
     end
 
     it 'tells the user what forum it will be posted in' do
-      rendered.should contain "This post will be posted in the forum #{@forum.name}"
+      rendered.should have_content "This post will be posted in the forum #{@forum.name}"
     end
 
     it "asks what's going on generally" do
       render
-      rendered.should_not contain "What's going on in your food garden?"
-      rendered.should contain "What's up?"
+      rendered.should_not have_content "What's going on in your food garden?"
+      rendered.should have_content "What's up?"
     end
   end
 
   it 'shows markdown help' do
     render
-    rendered.should contain 'Markdown'
+    rendered.should have_content 'Markdown'
   end
 
 end
diff --git a/spec/views/posts/show.html.haml_spec.rb b/spec/views/posts/show.html.haml_spec.rb
index d9682b015..e1ea7a77e 100644
--- a/spec/views/posts/show.html.haml_spec.rb
+++ b/spec/views/posts/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "posts/show" do
   before(:each) do
@@ -55,7 +55,7 @@ describe "posts/show" do
     end
 
     it "shows comments" do
-      rendered.should contain @comment.body
+      rendered.should have_content @comment.body
     end
 
     it 'has an anchor to the comments' do
@@ -79,7 +79,7 @@ describe "posts/show" do
     end
 
     it "shows the oldest comments first" do
-      rendered.should contain /#{@comment1.body}.*#{@comment2.body}.*#{@comment3.body}.*#{@comment4.body}/m
+      rendered.should have_content /#{@comment1.body}.*#{@comment2.body}.*#{@comment3.body}.*#{@comment4.body}/m
     end
   end
 
@@ -88,7 +88,7 @@ describe "posts/show" do
       @post = assign(:post,
         FactoryGirl.create(:forum_post, :author => @author))
       render
-      rendered.should contain "in #{@post.forum.name}"
+      rendered.should have_content "in #{@post.forum.name}"
     end
   end
   
diff --git a/spec/views/posts/show.rss.haml_spec.rb b/spec/views/posts/show.rss.haml_spec.rb
index 2f2780d09..72e8e7347 100644
--- a/spec/views/posts/show.rss.haml_spec.rb
+++ b/spec/views/posts/show.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'posts/show.rss.haml' do
   before(:each) do
@@ -12,20 +12,20 @@ describe 'posts/show.rss.haml' do
   end
 
   it 'shows RSS feed title' do
-    rendered.should contain "Recent comments on #{@post.subject}"
+    rendered.should have_content "Recent comments on #{@post.subject}"
   end
 
   it 'shows item title' do
-    rendered.should contain "Comment by #{@author.login_name}"
+    rendered.should have_content "Comment by #{@author.login_name}"
   end
 
   it 'escapes html for link to post' do
     # it's then unescaped by 'render' so we don't actually look for &lt;
-    rendered.should contain '<a href='
+    rendered.should have_content '<a href='
   end
 
   it 'shows content of comments' do
-    rendered.should contain "OMG LOL"
+    rendered.should have_content "OMG LOL"
   end
 
 end
diff --git a/spec/views/products/edit.html.haml_spec.rb b/spec/views/products/edit.html.haml_spec.rb
index 875fab4b2..3505c0216 100644
--- a/spec/views/products/edit.html.haml_spec.rb
+++ b/spec/views/products/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "products/edit" do
   before(:each) do
diff --git a/spec/views/products/index.html.haml_spec.rb b/spec/views/products/index.html.haml_spec.rb
index 0e18b8ddc..2b96540c1 100644
--- a/spec/views/products/index.html.haml_spec.rb
+++ b/spec/views/products/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "products/index" do
   before(:each) do
diff --git a/spec/views/products/new.html.haml_spec.rb b/spec/views/products/new.html.haml_spec.rb
index 769fbe6bd..ab7bc5f7e 100644
--- a/spec/views/products/new.html.haml_spec.rb
+++ b/spec/views/products/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "products/new" do
   before(:each) do
diff --git a/spec/views/products/show.html.haml_spec.rb b/spec/views/products/show.html.haml_spec.rb
index 12710a91f..c33fd2b81 100644
--- a/spec/views/products/show.html.haml_spec.rb
+++ b/spec/views/products/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "products/show" do
   before(:each) do
@@ -8,8 +8,8 @@ describe "products/show" do
   it "renders attributes in <p>" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should contain @product.name
-    rendered.should contain @product.min_price.to_s
-    rendered.should contain @product.recommended_price.to_s
+    rendered.should have_content @product.name
+    rendered.should have_content @product.min_price.to_s
+    rendered.should have_content @product.recommended_price.to_s
   end
 end
diff --git a/spec/views/roles/edit.html.haml_spec.rb b/spec/views/roles/edit.html.haml_spec.rb
index 2e2f66c7b..2b12e05d5 100644
--- a/spec/views/roles/edit.html.haml_spec.rb
+++ b/spec/views/roles/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "roles/edit" do
   before(:each) do
diff --git a/spec/views/roles/index.html.haml_spec.rb b/spec/views/roles/index.html.haml_spec.rb
index 3c62e0986..1b732c381 100644
--- a/spec/views/roles/index.html.haml_spec.rb
+++ b/spec/views/roles/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "roles/index" do
   before(:each) do
diff --git a/spec/views/roles/new.html.haml_spec.rb b/spec/views/roles/new.html.haml_spec.rb
index e15e14226..bba7e62b7 100644
--- a/spec/views/roles/new.html.haml_spec.rb
+++ b/spec/views/roles/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "roles/new" do
   before(:each) do
diff --git a/spec/views/roles/show.html.haml_spec.rb b/spec/views/roles/show.html.haml_spec.rb
index 389a5c8c3..16f48415f 100644
--- a/spec/views/roles/show.html.haml_spec.rb
+++ b/spec/views/roles/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "roles/show" do
   before(:each) do
diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb
index 1b48c51cd..3e5dc9e91 100644
--- a/spec/views/scientific_names/edit.html.haml_spec.rb
+++ b/spec/views/scientific_names/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "scientific_names/edit" do
   context "logged in" do
@@ -13,7 +13,7 @@ describe "scientific_names/edit" do
     end
 
   it "shows the creator" do
-    rendered.should contain "Added by #{@scientific_name.creator} less than a minute ago."
+    rendered.should have_content "Added by #{@scientific_name.creator} less than a minute ago."
   end
 
     it "renders the edit scientific_name form" do
diff --git a/spec/views/scientific_names/index.html.haml_spec.rb b/spec/views/scientific_names/index.html.haml_spec.rb
index fff8874f5..a49b9ef88 100644
--- a/spec/views/scientific_names/index.html.haml_spec.rb
+++ b/spec/views/scientific_names/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "scientific_names/index" do
   before(:each) do
@@ -17,8 +17,8 @@ describe "scientific_names/index" do
 
   it "doesn't show edit/destroy links" do
     render
-    rendered.should_not contain "Edit"
-    rendered.should_not contain "Delete"
+    rendered.should_not have_content "Edit"
+    rendered.should_not have_content "Delete"
   end
 
   context "logged in and crop wrangler" do
@@ -30,8 +30,8 @@ describe "scientific_names/index" do
 
     it "shows edit/destroy links" do
       render
-      rendered.should contain "Edit"
-      rendered.should contain "Delete"
+      rendered.should have_content "Edit"
+      rendered.should have_content "Delete"
     end
   end
 end
diff --git a/spec/views/scientific_names/new.html.haml_spec.rb b/spec/views/scientific_names/new.html.haml_spec.rb
index 9c892f5ef..151908e7d 100644
--- a/spec/views/scientific_names/new.html.haml_spec.rb
+++ b/spec/views/scientific_names/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "scientific_names/new" do
   before(:each) do
diff --git a/spec/views/scientific_names/show.html.haml_spec.rb b/spec/views/scientific_names/show.html.haml_spec.rb
index 6fbb95e42..d2927c5a9 100644
--- a/spec/views/scientific_names/show.html.haml_spec.rb
+++ b/spec/views/scientific_names/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "scientific_names/show" do
   before(:each) do
diff --git a/spec/views/seeds/edit.html.haml_spec.rb b/spec/views/seeds/edit.html.haml_spec.rb
index 03b2064cf..6a0235e4b 100644
--- a/spec/views/seeds/edit.html.haml_spec.rb
+++ b/spec/views/seeds/edit.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "seeds/edit" do
   before(:each) do
diff --git a/spec/views/seeds/index.html.haml_spec.rb b/spec/views/seeds/index.html.haml_spec.rb
index 036c4aa04..a1d478544 100644
--- a/spec/views/seeds/index.html.haml_spec.rb
+++ b/spec/views/seeds/index.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "seeds/index" do
   before(:each) do
@@ -45,7 +45,7 @@ describe "seeds/index" do
 
   it "provides data links" do
     render
-    rendered.should contain "The data on this page is available in the following formats:"
+    rendered.should have_content "The data on this page is available in the following formats:"
     assert_select "a", :href => seeds_path(:format => 'csv')
     assert_select "a", :href => seeds_path(:format => 'json')
     assert_select "a", :href => seeds_path(:format => 'rss')
diff --git a/spec/views/seeds/index.rss.haml_spec.rb b/spec/views/seeds/index.rss.haml_spec.rb
index 0b30d19a5..485f390d0 100644
--- a/spec/views/seeds/index.rss.haml_spec.rb
+++ b/spec/views/seeds/index.rss.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'seeds/index.rss.haml' do
   before(:each) do
@@ -14,23 +14,23 @@ describe 'seeds/index.rss.haml' do
     end
 
     it 'shows RSS feed title' do
-      rendered.should contain "Recent seeds from all members"
+      rendered.should have_content "Recent seeds from all members"
     end
 
     it 'has a useful item title' do
-      rendered.should contain "#{@seed.owner}'s #{@seed.crop} seeds"
+      rendered.should have_content "#{@seed.owner}'s #{@seed.crop} seeds"
     end
 
     it 'shows the seed count' do
-      rendered.should contain "Quantity: #{@seed.quantity}"
+      rendered.should have_content "Quantity: #{@seed.quantity}"
     end
 
     it 'shows the plant_before date' do
-      rendered.should contain "Plant before: #{@seed.plant_before.to_s}"
+      rendered.should have_content "Plant before: #{@seed.plant_before.to_s}"
     end
 
     it 'mentions that one seed is tradable' do
-      rendered.should contain "Will trade #{@tradable.tradable_to} from #{@tradable.owner.location}"
+      rendered.should have_content "Will trade #{@tradable.tradable_to} from #{@tradable.owner.location}"
     end
 
   end
@@ -44,7 +44,7 @@ describe 'seeds/index.rss.haml' do
     end
 
     it 'shows RSS feed title' do
-      rendered.should contain "Recent seeds from #{@seed.owner}"
+      rendered.should have_content "Recent seeds from #{@seed.owner}"
     end
   end
 end
diff --git a/spec/views/seeds/new.html.haml_spec.rb b/spec/views/seeds/new.html.haml_spec.rb
index a88713181..9abb2f291 100644
--- a/spec/views/seeds/new.html.haml_spec.rb
+++ b/spec/views/seeds/new.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "seeds/new" do
   before(:each) do
@@ -22,7 +22,7 @@ describe "seeds/new" do
 
   it 'reminds you to set your location' do
     render
-    rendered.should contain "Don't forget to set your location."
+    rendered.should have_content "Don't forget to set your location."
     assert_select "a", :text => "set your location"
   end
 
@@ -37,7 +37,7 @@ describe "seeds/new" do
 
     it 'shows the location' do
       render
-      rendered.should contain "from #{@member.location}."
+      rendered.should have_content "from #{@member.location}."
       assert_select 'a', :href => place_path(@member.location)
     end
 
diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb
index 737cf0232..af00b4efe 100644
--- a/spec/views/seeds/show.html.haml_spec.rb
+++ b/spec/views/seeds/show.html.haml_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "seeds/show" do
   before(:each) do
@@ -9,7 +9,7 @@ describe "seeds/show" do
 
   it "renders attributes in <p>" do
     render
-    rendered.should contain @seed.crop.name
+    rendered.should have_content @seed.crop.name
   end
 
   context "tradable" do
@@ -25,12 +25,12 @@ describe "seeds/show" do
 
     it "shows tradable attributes" do
       render
-      rendered.should contain "Will trade: locally"
+      rendered.should have_content "Will trade: locally"
     end
 
     it "shows location of seed owner" do
       render
-      rendered.should contain @owner.location
+      rendered.should have_content @owner.location
       assert_select 'a', :href => place_path(@owner.location)
     end
 
@@ -44,7 +44,7 @@ describe "seeds/show" do
 
       it 'says "from unspecified location"' do
         render
-        rendered.should contain "(from unspecified location)"
+        rendered.should have_content "(from unspecified location)"
       end
 
       it "links to profile to set location" do
@@ -55,7 +55,7 @@ describe "seeds/show" do
 
     it "shows button to send message" do
       render
-      rendered.should contain "Request seeds"
+      rendered.should have_content "Request seeds"
     end
 
   end
diff --git a/spec/views/shop/index_spec.rb b/spec/views/shop/index_spec.rb
index 49034368d..ee9ee59a9 100644
--- a/spec/views/shop/index_spec.rb
+++ b/spec/views/shop/index_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'shop/index.html.haml', :type => "view" do
   before(:each) do
@@ -20,7 +20,7 @@ describe 'shop/index.html.haml', :type => "view" do
     end
 
     it 'shows prices in AUD' do
-      rendered.should contain '9.99 AUD'
+      rendered.should have_content '9.99 AUD'
     end
 
     it 'should contain an exchange rate link' do
@@ -29,7 +29,7 @@ describe 'shop/index.html.haml', :type => "view" do
     end
 
     it 'shows recommended price for products that have it' do
-      rendered.should contain '12.00 AUD'
+      rendered.should have_content '12.00 AUD'
     end
 
     it 'should contain an exchange rate link for recommended price' do
@@ -55,12 +55,12 @@ describe 'shop/index.html.haml', :type => "view" do
     end
 
     it "recognises the paid member" do
-      @member.is_paid?.should be_true
+      @member.is_paid?.should be(true)
     end
 
     it "tells you you have a paid membership" do
       render
-      rendered.should contain "You currently have a paid"
+      rendered.should have_content "You currently have a paid"
     end
 
     it "doesn't show shop" do
@@ -77,7 +77,7 @@ describe 'shop/index.html.haml', :type => "view" do
     end
 
     it "tells you to sign up/sign in" do
-      rendered.should contain "sign in or sign up"
+      rendered.should have_content "sign in or sign up"
     end
   end
 
diff --git a/spec/views/support/index_spec.rb b/spec/views/support/index_spec.rb
index 0c7491ed7..fc3a96b12 100644
--- a/spec/views/support/index_spec.rb
+++ b/spec/views/support/index_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'support/index.html.haml', :type => "view" do
   before(:each) do
@@ -6,11 +6,11 @@ describe 'support/index.html.haml', :type => "view" do
   end
 
   it 'should show support faq' do
-    rendered.should contain 'About Growstuff'
+    rendered.should have_content 'About Growstuff'
   end
 
   it 'should not mention Courtney any more' do
-    rendered.should_not contain 'Courtney'
-    rendered.should_not contain 'phazel'
+    rendered.should_not have_content 'Courtney'
+    rendered.should_not have_content 'phazel'
   end
 end
diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep
deleted file mode 100644
index e69de29bb..000000000