Also please don't submit the PR with these types of formatting changes.  It looks like it was done from an IDE so I will review this one but 500 line commits for formatting is rough.  I will be switching to a compressor (django-compressor/django-pipeline) for media concat/compress anyway so the formatting is preference.