Added timezone support to stop Django crying about not supplying a datetime with a tz