Stupid cleanup for no reason
Fixed some pep8 errors
Merge branch 'master' of github.com:roaet/quark

Conflicts:
	quark/plugin.py