made datetimes timezone aware
Merge updates for django 1.5