Fixed some pep8 errors and undid some bug fixes.

Conflicts:
	quark/plugin.py