Changed the code that checks whether a date has timezone information.  Instead of looking only for tz_id, we also check for the key 'zone'.  It was incorrectly appending a Z at the end of GRAM AM expire times.
Changed the code that checks whether a date has timezone information.  Instead of looking only for tz_id, we also check for the key 'zone'.  It was incorrectly
appending a Z at the end of GRAM AM expire times.

charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal