Increase default subcommand timeout to 30s
Increase default subcommand timeout to 30s

None of this is great, but this is the easiest immediate band-aid we
have.

Closes #1087.

golang/dep,golang/dep,ibrasho-forks/dep,ibrasho-forks/dep,golang/dep