pep8 and nose on tests
Merge branch 'master' of github.com:komoot/photon

Conflicts:
	test/run_tests.py