Fix all flake8 2.1.0 warnings

Conflicts:
	feincms/__init__.py
Merge remote-tracking branch 'official/master'

* official/master:
  Update docs to mention modeladmins