version 2.1

Added code from timezone-demo to find the TZ offset (so it isn't hard coded)
Refactored extensively