Fix all flake8 2.1.0 warnings
Fix all flake8 2.1.0 warnings

Conflicts:
	feincms/__init__.py
Merge branch 'master' into next

* master:
  Fix all flake8 2.1.0 warnings