fix flake8
Merge branch 'master' of https://github.com/simod/geonode

Conflicts:
	geonode/layers/models.py