Fix pep8 errors and warnings
Merge branch 'pep8'

Conflicts:
	sorl/thumbnail/admin/current.py