fix workaround for java timezone bug, and add test to ensure bug does not come back later
Merge pull request #28 from abannert/fix-timezone-workaround

fix workaround for java timezone bug, and add test to ensure bug does not return