Take pyflakes/pylint fixes from master

Conflicts:
	nameko/service.py