Use newer version of acts_as_versioned so we can upgrade Rails
Upgrade to Rails 3.1

And upgrade will_paginate to allow us to
Revert "Update this to match the older version of the mail gem we're using"

This reverts commit b9a2d996408c1ef703aa78311f8c2a0f6e0d7afc.
No longer available in Rails 3.1
Different class in newer version of will_paginate
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
See how we go not disabling this now
Update view test for Rails 3.1
This is already defined in xapian_index
Remove empty fixtures
We need to reload here in Rails 3.1 (caching?)
We use info_request_id in the view so we should use it in the test
We can't mock this in Rails 3.1 so switch to using fixture_file_upload instead
In will_paginate 3 you can call paginate directly on the model
Params are passed through as strings in Rails 3.1
Specify the format so Rails doesn't just search for atom format
Convert validators to newer, more Railsy ActiveModel
Remove schema information as this won't be updated any more
rhtml is deprecated so rename fixture templates
This is cast to a string in Rails 3.1