Updated for Rails 4.0.0.beta1 and Ruby 2.0.0