Merge pull request #20 from andymckay/master

skip resets
lift code from django-nose to support django 1.5
Merge pull request #23 from wraithan/django-1.5

Lift code from django-nose to support django 1.5
make jinja2 optional