Merge pull request #1 from aaearon/master

don't bother making get request if optional username and password argume...
Use local timezone for default time shift
Update generate.py
Merge pull request #2 from kwaaak/master

Use local timezone for default time shift