Update for Rails 4.x and rSpec 3.x