removed django trunk from testing
Merge pull request #2762 from digi604/notrunk

removed django trunk from testing
Change test_fixture_load to check for rescanned placeholders
update_home shouldn't be executed during loaddata command