Increased timeout to 120 seconds.
Merge pull request #37 from brennonbrimhall/topic/timeouts

Increased timeout to 120 seconds.