Put new lines back in. Pep8 fixes.
Merge commit '4fc0786004f6ad1decff852d485c0521473e11a3'

Conflicts:
	rplugin/python/floobits/common/flooui.py