timezine -> timezone
Merge pull request #401 from jplock/patch-1

timezine -> timezone
Merge remote-tracking branch 'upstream/master'