PEP cleanup
Merge branch 'develop' into autodetect-terminal-size

Conflicts:
	mps_youtube/main.py