Handle new default timeout mechanism from Django 1.6+

Hi,

I have updated the code to handle the new constant introduced in Django 1.6+ for default timeout.

I have also updated the tests ``manage.py`` to work with Django 1.5+.

Let me know if you want more information.