Avoid testing Django master against Python 2.6 since it's not supported.
Avoid installing South on Django 1.7+ since it's not supported.
Minor white space and structure fixes.