adding back support for setting timeout per operation
Merge pull request #121 from jsanda/op-timeout

adding back support for setting timeout per operation