Update for Ruby 2.0.0 and new Rails 3.0.9