timeout handler was always firing, fixed
Merge pull request #11 from thomasdavis/gh-pages

timeout handler was always firing, fixed