Fix the `expires_in` value that was wrong

because timedelta.seconds does take into account the days attribute of
timedelta.
Fix python2.6 compatibility
Add some tests
Replace naive datetimes with its aware equivalent
Ensure that both dates are aware before substracting
Added Django trunk to test runner
Merge remote-tracking branch 'origin/master'

Conflicts:
	tox.ini