Changed timeout_sec arg to 'timeout-sec' (with a dash) for consistency
Changed default timeout to match what's in the docs (5 minutes)
Merge pull request #32 from edx/will/timeout-adjustments

Adjusted timeouts