fix #1483 -- fix OS X time zone detection

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Merge branch 'fix-osx-init'