Merge pull request #2 from f0rkz/master

bootstrap stuff
timezone update got overwritten with previous commit
minor changes
Merge pull request #18 from swangy/master

fixed overlapping commits, timezone fix got overwritten