Upgrade to Rails 2.3.15, Rack 1.1.3

Conflicts:

    config/environment.rb