Update to remove DiscoverRunnerWithExtraApps

DiscoverRunnerWithExtraApps no longer works with Django 1.7 and the new
app loading features. Moving to test settings seems like a nicer way to
solve this anyway.
Thank you for alphabetizing and cleaning.