flake8

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'master' into per-plugin-loggers

Conflicts:
	nikola/utils.py