Reverted Aaron's changes
Merge branch 'fixture_cache_clean' of https://github.com/Kaermes/rails into fixture_cache_clean