make timeout configurable
Merge pull request #39 from bazaarvoice/BugFixMakingTimeoutConfigurable

make timeout configurable