Changes to stopwatch to work properly with our django-nose