Merge branch 'master' into relative-imports

Author: thraxil

Makefile

@@ -4,7 +4,7 @@ test:
 	./ve/bin/pip install .
 	./ve/bin/pip install flake8
 	./ve/bin/flake8 smoketest exceptionstest main testapp --max-complexity=9
-	cd testapp && ../ve/bin/python manage.py test
+	./ve/bin/python runtests.py
 
 clean:
 	rm -rf ve