Fix request expiration timezone

I was getting errors while trying to turn on time zone support for Django and Celery.  I believe this fix makes `now` and `self.expires` always be both time zone aware or time zone unaware so that they can be compared.  

This is basically #1885 turned into a pull request.