Fix #747
flake8 harder
Merge branch 'master' of github.com:getnikola/nikola