Challenges fixed
Merge branch 'pre_rails32_test_update' of git://github.com/scottsds/otwarchive into importing_fixed