Added related_bundle to contentypes related fields. Also moved the order of related_bundle in method signatures to maintain backwards compatibility in when called with positional args.
Changes to make tests run faster. Also organized requirements.
Fixed __unicode__ method in test model.
Merge branch 'master' into test-enhancements
Used mock library to avoid some time.sleep() calls.