Merge pull request #811 from pganssle/improved_tzname

Improve tzname_in_python2 decorator