added timeout

trying to get timing correct
Merge pull request #62 from gsn/gh-pages

added timeout
Merge pull request #63 from gsn/staging

Staging