Address flake8 complaints
Add space to mollify flake8
Merge branch 'ecobenefits-server-template'
Merge branch 'master' of https://github.com/azavea/OTM2

Conflicts:
	opentreemap/treemap/tests/views.py