PEP8
Merge branch 'master' of github.com:CIRCL/urlquery_python_api

Conflicts:
	setup.py