Don't add extra spaces when joining lines
Swap khuno for vim-flake8