Reworking a bit more (timezone import bits borrowed from modcloth)

Signed-off-by: Jacques Marneweck <jacques@powertrip.co.za>