Pre Rails 3.2 test updates
Merge branch 'pre_rails32_test_update' of git://github.com/scottsds/otwarchive into importing_fixed
All Finished
Merge branch 'pre_rails32_test_update' of git://github.com/scottsds/otwarchive into importing_fixed